Changeset 2de2b991 in ffmpeg

Timestamp:

May 19, 2014, 1:13:16 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

87f5ede6

Parents:

3791741c (diff), dc40d886 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'

• commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0': avconv: do not use poorly defined and undocumented AVStream.pts

Conflicts:

ffmpeg.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)