diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:14:46 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:14:46 +0400 |
| commit | 92e10e34b1422423715bbfadfcd19b045f63dbcc (patch) | |
| tree | 397c5fe54835f043d6bc40bce7fb1e02b13c034e /libavcodec/mpegvideo.h | |
| parent | 56572787ae2d7e113e36d5347b3d7263b35bdf98 (diff) | |
| parent | e41ff4210ac1192c62de3052b33a38c7bcf772f2 (diff) | |
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/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 1cd56ea42b..614a45bb5b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -609,7 +609,6 @@ typedef struct MpegEncContext { int vo_type; int vol_control_parameters; ///< does the stream contain the low_delay flag, used to workaround buggy encoders int intra_dc_threshold; ///< QP above whch the ac VLC should be used for intra dc - int use_intra_dc_vlc; PutBitContext tex_pb; ///< used for data partitioned VOPs PutBitContext pb2; ///< used for data partitioned VOPs int mpeg_quant; |