virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-26 14:34:52 +01:00
parent 2992afda83
commit 6e81597d5a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpeg4video.h
View File

@ -74,6 +74,7 @@ typedef struct Mpeg4DecContext {
int t_frame; int t_frame;
int new_pred; int new_pred;
int enhancement_type;
/* bug workarounds */ /* bug workarounds */
int divx_version; int divx_version;

4
libavcodec/mpeg4videodec.c
View File

@ -1969,7 +1969,7 @@ no_cplx_est:
h_sampling_factor_m = get_bits(gb, 5); h_sampling_factor_m = get_bits(gb, 5);
v_sampling_factor_n = get_bits(gb, 5); v_sampling_factor_n = get_bits(gb, 5);
v_sampling_factor_m = get_bits(gb, 5); v_sampling_factor_m = get_bits(gb, 5);
s->enhancement_type = get_bits1(gb); ctx->enhancement_type = get_bits1(gb);
if (h_sampling_factor_n == 0 || h_sampling_factor_m == 0 || if (h_sampling_factor_n == 0 || h_sampling_factor_m == 0 ||
v_sampling_factor_n == 0 || v_sampling_factor_m == 0) { v_sampling_factor_n == 0 || v_sampling_factor_m == 0) {
@ -2253,7 +2253,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I) if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I)
skip_bits1(gb); // vop shape coding type skip_bits1(gb); // vop shape coding type
} else { } else {
if (s->enhancement_type) { if (ctx->enhancement_type) {
int load_backward_shape = get_bits1(gb); int load_backward_shape = get_bits1(gb);
if (load_backward_shape) if (load_backward_shape)
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,

1
libavcodec/mpegvideo.h
View File

@ -590,7 +590,6 @@ typedef struct MpegEncContext {
int quant_precision; int quant_precision;
int quarter_sample; ///< 1->qpel, 0->half pel ME/MC int quarter_sample; ///< 1->qpel, 0->half pel ME/MC
int scalability; int scalability;
int enhancement_type;
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