Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 19:16:36 +0000 (21:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 19:16:36 +0000 (21:16 +0200)
commite05fda99f7a4e1e80479b4e9b4a92e33dd0c06be
treea19ac75cb8ff278c7fc69d2dfffdb29b796f62d1
parentdb8ae37a783aba18d8f869dae1824a3e3f984bf8
parentf8716a1408f4f4ec63857b7015fbd62f9eac344a
Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'

* commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a':
  mpegvideo: Rework frame_size_alloc function

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h