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/mpeg4video.h | |
| parent | 4c55aa8f93c61b33d44b8d23e20ae78a72249bf6 (diff) | |
| parent | 513d849bb605d3d862da1ada709bd2ca1ac68f58 (diff) | |
| download | ffmpeg-7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a.tar.gz | |
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/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 4d13382f30..b9df80fd91 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -67,6 +67,8 @@ typedef struct Mpeg4DecContext { int shape; int vol_sprite_usage; int sprite_brightness_change; + int num_sprite_warping_points; + // reversible vlc int rvlc; ///< could this stream contain resync markers |