Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:11:16 +0000 (03:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:11:16 +0000 (03:11 +0100)
commit3e5cd34cd01f889a841ae850bf7776b9e33082e9
treeaa06e0a1ec2f426b48571eb5a0d86656c9a376a2
parentb08ff07d8d9a4bd1c8785c22888e5a19a7da0861
parent038890740014dc33d2e2f04da7cf0a9da821264e
Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'

* commit '038890740014dc33d2e2f04da7cf0a9da821264e':
  mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

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