Changeset 3bf189bb in ffmpeg

Timestamp:

Apr 22, 2014, 11:45:34 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8064c6ac

Parents:

5e6be52b (diff), 1ae8198b (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 '1ae8198bca749a0cff205196cc83d35b9962849b'

• commit '1ae8198bca749a0cff205196cc83d35b9962849b': avconv: always reset packet pts after decoding an audio frame

Conflicts:

ffmpeg.c

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

(No files)