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/mpegvideo.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/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 a95bc2a6a1..468c82da7b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -615,7 +615,6 @@ typedef struct MpegEncContext { int low_latency_sprite; int data_partitioning; ///< data partitioning flag from header int partitioned_frame; ///< is current frame partitioned - int rvlc; ///< reversible vlc int resync_marker; ///< could this stream contain resync markers int low_delay; ///< no reordering needed / has no b-frames int vo_type; |