diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:26:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:27:30 +0100 |
| commit | 9c835acc1da49919449f11d2f86b3422aee85ea0 (patch) | |
| tree | 16af0df43149b7fabe72363237707dfe7caa2374 /libavcodec/mpeg4video.h | |
| parent | cdc21e4abe2a0e9394638bb09086ac2068f0683b (diff) | |
| parent | bc5abfb19e7ff00b859120561d6ffd622c7904fe (diff) | |
| download | ffmpeg-9c835acc1da49919449f11d2f86b3422aee85ea0.tar.gz | |
Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'
* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
mpeg4videodec: move MpegEncContext.rvlc 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 2cf23182f9..d06f54cd8a 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -66,6 +66,8 @@ typedef struct Mpeg4DecContext { int time_increment_bits; int shape; int vol_sprite_usage; + // reversible vlc + int rvlc; } Mpeg4DecContext; /* dc encoding for mpeg4 */ |