Changeset 179527f3 in ffmpeg

Timestamp:

May 22, 2015, 7:17:34 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f275f9ea

Parents:

a25ee5f9 (diff), a3f4c930 (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> (05/22/15 19:17:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/22/15 19:17:34)

Message:

Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'

• commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2': mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:

libavcodec/mpegvideo.c

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

(No files)