Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'

* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091':
  mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext

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

diff --cc libavcodec/mpeg4video.h
Simple merge

diff --cc libavcodec/mpeg4videodec.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge