OSDN Git Service

Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:29:22 +0000 (04:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:29:26 +0000 (04:29 +0100)
commit4c55aa8f93c61b33d44b8d23e20ae78a72249bf6
treeccb8b6fcddb0b44f6a7d734fd3790eec1ce767d0
parentae4e7f7ba603a1624d4aaeee2c368677739b7322
parent9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091
Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'

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

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