Michael Niedermayer db8ae37a78 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>

2015-06-08 21:05:12 +02:00

25 KiB

Raw Blame History

View Raw