mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-23 06:46:42 +00:00
Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'
* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324': mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b27ba2e540
@ -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;
|
||||||
|
@ -2007,7 +2007,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) {
|
||||||
@ -2445,7 +2445,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,
|
||||||
|
@ -606,7 +606,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
|
||||||
|
Loading…
Reference in New Issue
Block a user