virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-26 14:34:52 +01:00
parent 8cebc9eaac
commit e89247debd
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4videodec.c
View File

@ -1946,13 +1946,11 @@ no_cplx_est:
skip_bits(gb, 2); /* requested upstream message type */ skip_bits(gb, 2); /* requested upstream message type */
skip_bits1(gb); /* newpred segment type */ skip_bits1(gb); /* newpred segment type */
} }
s->reduced_res_vop = get_bits1(gb); if (get_bits1(gb)) // reduced_res_vop
if (s->reduced_res_vop)
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"reduced resolution VOP not supported\n"); "reduced resolution VOP not supported\n");
} else { } else {
s->new_pred = 0; s->new_pred = 0;
s->reduced_res_vop = 0;
} }
s->scalability = get_bits1(gb); s->scalability = get_bits1(gb);

1
libavcodec/mpegvideo.h
View File

@ -593,7 +593,6 @@ typedef struct MpegEncContext {
int hierachy_type; int hierachy_type;
int enhancement_type; int enhancement_type;
int new_pred; int new_pred;
int reduced_res_vop;
int aspect_ratio_info; //FIXME remove int aspect_ratio_info; //FIXME remove
int sprite_warping_accuracy; int sprite_warping_accuracy;
int data_partitioning; ///< data partitioning flag from header int data_partitioning; ///< data partitioning flag from header