[FFmpeg-cvslog] Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 21:30:05 2015 +0200| [3244a176505b04f62f7bbb1ac7fb413399a6790c] | committer: Michael Niedermayer

Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'

* commit '9bb11be0e5a75782c3139ad058c2b571499aa37d':
  mpegvideo: Split picture allocation for encoding and decoding

Conflicts:
	libavcodec/mpegvideo.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3244a176505b04f62f7bbb1ac7fb413399a6790c
---