Changeset a25ee5f9 in ffmpeg

Timestamp:

May 22, 2015, 7:15:32 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

179527f3

Parents:

bc373595 (diff), d5280455 (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 18:57:30)

git-committer:

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

Message:

Merge commit 'd528045558825f01472e9bee873f60c98d661e53'

• commit 'd528045558825f01472e9bee873f60c98d661e53': mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:

libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

The memset is left in place

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

(No files)