Changeset db8ae37a in ffmpeg

Timestamp:

Jun 8, 2015, 7:05:12 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e05fda99

Parents:

34d278f9 (diff), da0c8664 (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> (06/08/15 18:58:13)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/08/15 19:05:12)

Message:

Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'

• commit 'da0c8664b4dc906696803685f7e53ade68594ab8': mpegvideo: Move various temporary buffers to a separate context

Conflicts:

libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/vc1_mc.c

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

(No files)