diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-09 16:51:21 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-09 16:51:21 +0000 |
| commit | 49186206eb7fccf54c2733209bc025051c16fb79 (patch) | |
| tree | 005f85779d960eda48b42af3d6f9b368b9982938 /libavcodec | |
| parent | 6dde9f8c2085c6eca253ca27190d4ae7e248bfc2 (diff) | |
| download | ffmpeg-49186206eb7fccf54c2733209bc025051c16fb79.tar.gz | |
Add refdist_flag to VC1Context.
Originally committed as revision 16504 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1.c | 6 | ||||
| -rw-r--r-- | libavcodec/vc1.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 3d9a10bd68..62a0a97b2a 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1059,13 +1059,13 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb) { VC1Context *v = avctx->priv_data; - int i, blink, clentry, refdist; + int i, blink, clentry; av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32)); blink = get_bits1(gb); // broken link clentry = get_bits1(gb); // closed entry v->panscanflag = get_bits1(gb); - refdist = get_bits1(gb); // refdist flag + v->refdist_flag = get_bits1(gb); v->s.loop_filter = get_bits1(gb); v->fastuvmc = get_bits1(gb); v->extended_mv = get_bits1(gb); @@ -1099,7 +1099,7 @@ static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb) "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n" "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n" "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n", - blink, clentry, v->panscanflag, refdist, v->s.loop_filter, + blink, clentry, v->panscanflag, v->refdist_flag, v->s.loop_filter, v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode); return 0; diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 4cd7bb1912..212842a06f 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -180,6 +180,7 @@ typedef struct VC1Context{ int interlace; ///< Progressive/interlaced (RPTFTM syntax element) int tfcntrflag; ///< TFCNTR present int panscanflag; ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present + int refdist_flag; ///< REFDIST syntax element present in II, IP, PI or PP field picture headers int extended_dmv; ///< Additional extended dmv range at P/B frame-level int color_prim; ///< 8bits, chroma coordinates of the color primaries int transfer_char; ///< 8bits, Opto-electronic transfer characteristics |