Changeset 17e47ec8 in ffmpeg

Timestamp:

Oct 28, 2013, 1:12:37 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

269b3c87

Parents:

feba750d (diff), a1c5cc42 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (10/28/13 12:55:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/28/13 13:12:37)

Message:

Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'

• commit 'a1c5cc429d99216406170eac7e8352860076d3e8': lavc: don't set AVFrame.pts to random numbers in decoders.

Conflicts:

libavcodec/mpeg4videodec.c

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

(No files)