diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:29:26 +0100 |
| commit | 4c55aa8f93c61b33d44b8d23e20ae78a72249bf6 (patch) | |
| tree | ccb8b6fcddb0b44f6a7d734fd3790eec1ce767d0 /libavcodec/mpegvideo.h | |
| parent | ae4e7f7ba603a1624d4aaeee2c368677739b7322 (diff) | |
| parent | 9ba3fc3e3d12c9ef00dcb0222b7ea0ccb5c4a091 (diff) | |
| download | ffmpeg-4c55aa8f93c61b33d44b8d23e20ae78a72249bf6.tar.gz | |
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/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index acc047c3fd..4a6d20f395 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -595,7 +595,6 @@ typedef struct MpegEncContext { uint16_t pb_time; ///< time distance between the last b and p,s,i frame uint16_t pp_field_time; uint16_t pb_field_time; ///< like above, just for interlaced - int sprite_brightness_change; int num_sprite_warping_points; int real_sprite_warping_points; uint16_t sprite_traj[4][2]; ///< sprite trajectory points |