summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-30 04:29:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 04:29:26 +0100
commit4c55aa8f93c61b33d44b8d23e20ae78a72249bf6 (patch)
treeccb8b6fcddb0b44f6a7d734fd3790eec1ce767d0 /libavcodec/mpeg4video.h
parentae4e7f7ba603a1624d4aaeee2c368677739b7322 (diff)
parent9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091 (diff)
Merge commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091'
* commit '9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091': mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
-rw-r--r--libavcodec/mpeg4video.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index d8751f7615..4d13382f30 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -66,6 +66,7 @@ typedef struct Mpeg4DecContext {
int time_increment_bits;
int shape;
int vol_sprite_usage;
+ int sprite_brightness_change;
// reversible vlc
int rvlc;
///< could this stream contain resync markers