diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:38:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:38:55 +0100 |
commit | 36e2ec40688d0c3c350d31fae00a54f6a23b7647 (patch) | |
tree | 80cf0550bc36f8b772d1cfbc83b1ea48e988ac45 /libavcodec/mpegvideo.h | |
parent | db7580b4f6b2217917aa6f372e3a18dfca43624a (diff) | |
parent | f7d228676cb7669059889c4225c8a8dc56708c24 (diff) |
Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
mpeg4videodec: move intra_dc_threshold 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 b1224bcf5d..a934a6d0a5 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -608,7 +608,6 @@ typedef struct MpegEncContext { int low_delay; ///< no reordering needed / has no b-frames 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 PutBitContext tex_pb; ///< used for data partitioned VOPs PutBitContext pb2; ///< used for data partitioned VOPs int mpeg_quant; |