virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'

Browse Source 
* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
  mpeg12dec: Use more specific error codes

Conflicts:
	libavcodec/mpeg12dec.c

See: 1852b2a0f4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-05 22:19:55 +01:00
parent bcc43de51f 3a56bcee7c
commit 9d921cce4f
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/mpeg12dec.c
View File

@@ -151,7 +151,7 @@ static inline int mpeg1_decode_block_intra(MpegEncContext *s,
component = (n <= 3 ? 0 : n - 4 + 1); component = (n <= 3 ? 0 : n - 4 + 1);
diff = decode_dc(&s->gb, component); diff = decode_dc(&s->gb, component);
if (diff >= 0xffff) if (diff >= 0xffff)
return -1; return AVERROR_INVALIDDATA;
dc = s->last_dc[component]; dc = s->last_dc[component];
dc += diff; dc += diff;
s->last_dc[component] = dc; s->last_dc[component] = dc;
@@ -563,7 +563,7 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s,
} }
diff = decode_dc(&s->gb, component); diff = decode_dc(&s->gb, component);
if (diff >= 0xffff) if (diff >= 0xffff)
return -1; return AVERROR_INVALIDDATA;
dc = s->last_dc[component]; dc = s->last_dc[component];
dc += diff; dc += diff;
s->last_dc[component] = dc; s->last_dc[component] = dc;
@@ -648,7 +648,7 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
} }
diff = decode_dc(&s->gb, component); diff = decode_dc(&s->gb, component);
if (diff >= 0xffff) if (diff >= 0xffff)
return -1; return AVERROR_INVALIDDATA;
dc = s->last_dc[component]; dc = s->last_dc[component];
dc += diff; dc += diff;
s->last_dc[component] = dc; s->last_dc[component] = dc;
@@ -1289,9 +1289,6 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
s1->mpeg_enc_ctx_allocated = 0; s1->mpeg_enc_ctx_allocated = 0;
} }
if ((s->width == 0) || (s->height == 0))
return -2;
ret = ff_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -1373,8 +1370,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
memcpy(old_permutation, s->idsp.idct_permutation, 64 * sizeof(uint8_t)); memcpy(old_permutation, s->idsp.idct_permutation, 64 * sizeof(uint8_t));
ff_mpv_idct_init(s); ff_mpv_idct_init(s);
if (ff_mpv_common_init(s) < 0) if ((ret = ff_mpv_common_init(s)) < 0)
return -2; return ret;
quant_matrix_rebuild(s->intra_matrix, old_permutation, s->idsp.idct_permutation); quant_matrix_rebuild(s->intra_matrix, old_permutation, s->idsp.idct_permutation);
quant_matrix_rebuild(s->inter_matrix, old_permutation, s->idsp.idct_permutation); quant_matrix_rebuild(s->inter_matrix, old_permutation, s->idsp.idct_permutation);
@@ -1695,7 +1692,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
if (!s->current_picture_ptr) { if (!s->current_picture_ptr) {
av_log(s->avctx, AV_LOG_ERROR, "first field missing\n"); av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
return -1; return AVERROR_INVALIDDATA;
} }
if (s->avctx->hwaccel && if (s->avctx->hwaccel &&
@@ -1910,7 +1907,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
((avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) && left > 8)) { ((avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) && left > 8)) {
av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n",
left, show_bits(&s->gb, FFMIN(left, 23))); left, show_bits(&s->gb, FFMIN(left, 23)));
return -1; return AVERROR_INVALIDDATA;
} else } else
goto eos; goto eos;
} }
@@ -1947,7 +1944,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
} else if (code == 35) { } else if (code == 35) {
if (s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0) { if (s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0) {
av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n"); av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n");
return -1; return AVERROR_INVALIDDATA;
} }
goto eos; /* end of slice */ goto eos; /* end of slice */
} }
@@ -2043,7 +2040,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg)
if (s->picture_structure == PICT_BOTTOM_FIELD) if (s->picture_structure == PICT_BOTTOM_FIELD)
mb_y++; mb_y++;
if (mb_y < 0 || mb_y >= s->end_mb_y) if (mb_y < 0 || mb_y >= s->end_mb_y)
return -1; return AVERROR_INVALIDDATA;
} }
} }
@@ -2192,8 +2189,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
{ {
Mpeg1Context *s1 = avctx->priv_data; Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx; MpegEncContext *s = &s1->mpeg_enc_ctx;
int i, v; int i, v, ret;
int ret;
/* start new MPEG-1 context decoding */ /* start new MPEG-1 context decoding */
s->out_format = FMT_MPEG1; s->out_format = FMT_MPEG1;