diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:34:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 04:34:46 +0100 |
| commit | 7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a (patch) | |
| tree | 493c4acd408ee2f0847e23ec06fc2b9bf7998ac8 /libavcodec/mpegvideo.h | |
| parent | 4c55aa8f93c61b33d44b8d23e20ae78a72249bf6 (diff) | |
| parent | 513d849bb605d3d862da1ada709bd2ca1ac68f58 (diff) | |
Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'
* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
mpeg4videodec: move num_sprite_warping_points 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 4a6d20f395..07c795bc81 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 num_sprite_warping_points; int real_sprite_warping_points; uint16_t sprite_traj[4][2]; ///< sprite trajectory points int sprite_offset[2][2]; ///< sprite offset[isChroma][isMVY] |