diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:14:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:14:46 +0100 |
| commit | 92e10e34b1422423715bbfadfcd19b045f63dbcc (patch) | |
| tree | 397c5fe54835f043d6bc40bce7fb1e02b13c034e /libavcodec/mpeg4video.h | |
| parent | 56572787ae2d7e113e36d5347b3d7263b35bdf98 (diff) | |
| parent | e41ff4210ac1192c62de3052b33a38c7bcf772f2 (diff) | |
| download | ffmpeg-92e10e34b1422423715bbfadfcd19b045f63dbcc.tar.gz | |
Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'
* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2':
mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index b6b0e5479f..dbad7f681a 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -83,6 +83,7 @@ typedef struct Mpeg4DecContext { int new_pred; int enhancement_type; int scalability; + int use_intra_dc_vlc; /* bug workarounds */ int divx_version; |