From: Michael Niedermayer <[email protected]>
Signed-off-by: Vittorio Giovara <[email protected]>
---
libavcodec/mpeg12dec.c | 56 +++++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 8aa23dc..8dd3810 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -149,7 +149,7 @@ static inline int mpeg1_decode_block_intra(MpegEncContext
*s,
component = (n <= 3 ? 0 : n - 4 + 1);
diff = decode_dc(&s->gb, component);
if (diff >= 0xffff)
- return -1;
+ return AVERROR_INVALIDDATA;
dc = s->last_dc[component];
dc += diff;
s->last_dc[component] = dc;
@@ -545,7 +545,7 @@ static inline int mpeg2_decode_block_intra(MpegEncContext
*s,
}
diff = decode_dc(&s->gb, component);
if (diff >= 0xffff)
- return -1;
+ return AVERROR_INVALIDDATA;
dc = s->last_dc[component];
dc += diff;
s->last_dc[component] = dc;
@@ -625,7 +625,7 @@ static inline int
mpeg2_fast_decode_block_intra(MpegEncContext *s,
}
diff = decode_dc(&s->gb, component);
if (diff >= 0xffff)
- return -1;
+ return AVERROR_INVALIDDATA;
dc = s->last_dc[component];
dc += diff;
s->last_dc[component] = dc;
@@ -731,7 +731,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t
block[12][64])
// FIXME not sure if this is allowed in MPEG at all
mb_type = s->current_picture.mb_type[s->mb_width + (s->mb_y -
1) * s->mb_stride - 1];
if (IS_INTRA(mb_type))
- return -1;
+ return AVERROR_INVALIDDATA;
s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
mb_type | MB_TYPE_SKIP;
// assert(s->current_picture.mb_type[s->mb_x + s->mb_y *
s->mb_stride - 1] & (MB_TYPE_16x16 | MB_TYPE_16x8));
@@ -751,7 +751,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t
block[12][64])
av_log(s->avctx, AV_LOG_ERROR,
"invalid mb type in I Frame at %d %d\n",
s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA;
} else {
@@ -763,7 +763,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t
block[12][64])
if (mb_type < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
mb_type = ptype2mb_type[mb_type];
break;
@@ -772,7 +772,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t
block[12][64])
if (mb_type < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
mb_type = btype2mb_type[mb_type];
break;
@@ -1012,7 +1012,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
default:
av_log(s->avctx, AV_LOG_ERROR,
"00 motion_type at %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
}
@@ -1029,7 +1029,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (cbp <= 0) {
av_log(s->avctx, AV_LOG_ERROR,
"invalid cbp at %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
#if FF_API_XVMC
@@ -1243,7 +1243,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
}
if ((s->width == 0) || (s->height == 0))
- return -2;
+ return AVERROR_INVALIDDATA;
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
@@ -1353,7 +1353,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
const uint8_t *buf,
ref = get_bits(&s->gb, 10); /* temporal ref */
s->pict_type = get_bits(&s->gb, 3);
if (s->pict_type == 0 || s->pict_type > 3)
- return -1;
+ return AVERROR_INVALIDDATA;
vbv_delay = get_bits(&s->gb, 16);
if (s->pict_type == AV_PICTURE_TYPE_P ||
@@ -1361,7 +1361,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
const uint8_t *buf,
s->full_pel[0] = get_bits1(&s->gb);
f_code = get_bits(&s->gb, 3);
if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM))
- return -1;
+ return AVERROR_INVALIDDATA;
s->mpeg_f_code[0][0] = f_code;
s->mpeg_f_code[0][1] = f_code;
}
@@ -1369,7 +1369,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
const uint8_t *buf,
s->full_pel[1] = get_bits1(&s->gb);
f_code = get_bits(&s->gb, 3);
if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM))
- return -1;
+ return AVERROR_INVALIDDATA;
s->mpeg_f_code[1][0] = f_code;
s->mpeg_f_code[1][1] = f_code;
}
@@ -1490,7 +1490,7 @@ static int load_matrix(MpegEncContext *s, uint16_t
matrix0[64],
int v = get_bits(&s->gb, 8);
if (v == 0) {
av_log(s->avctx, AV_LOG_ERROR, "matrix damaged\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (intra && i == 0 && v != 8) {
av_log(s->avctx, AV_LOG_ERROR, "intra matrix invalid, ignoring\n");
@@ -1668,7 +1668,7 @@ static int mpeg_field_start(MpegEncContext *s, const
uint8_t *buf, int buf_size)
if (!s->current_picture_ptr) {
av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (s->avctx->hwaccel &&
@@ -1734,7 +1734,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
if (s->qscale == 0) {
av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
/* extra slice info */
@@ -1751,7 +1751,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
MBINCR_VLC_BITS, 2);
if (code < 0) {
av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (code >= 33) {
if (code == 33)
@@ -1766,7 +1766,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
if (s->mb_x >= (unsigned) s->mb_width) {
av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (avctx->hwaccel) {
@@ -1885,7 +1885,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
((avctx->err_recognition & AV_EF_BUFFER) && left > 8)) {
av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n",
left, show_bits(&s->gb, FFMIN(left, 23)));
- return -1;
+ return AVERROR_INVALIDDATA;
} else
goto eos;
}
@@ -1902,7 +1902,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
MBINCR_VLC_BITS, 2);
if (code < 0) {
av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (code >= 33) {
if (code == 33) {
@@ -1910,7 +1910,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else if (code == 35) {
if (s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0)
{
av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
goto eos; /* end of slice */
}
@@ -1925,7 +1925,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (s->pict_type == AV_PICTURE_TYPE_I) {
av_log(s->avctx, AV_LOG_ERROR,
"skipped MB in I frame at %d %d\n", s->mb_x,
s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
/* skip mb */
@@ -1999,7 +1999,7 @@ static int slice_decode_thread(AVCodecContext *c, void
*arg)
if (s->picture_structure == PICT_BOTTOM_FIELD)
mb_y++;
if (mb_y < 0 || mb_y >= s->end_mb_y)
- return -1;
+ return AVERROR_INVALIDDATA;
}
}
@@ -2082,17 +2082,17 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
if (s->aspect_ratio_info == 0) {
av_log(avctx, AV_LOG_ERROR, "aspect ratio has forbidden 0 value\n");
if (avctx->err_recognition & AV_EF_BITSTREAM)
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->frame_rate_index = get_bits(&s->gb, 4);
if (s->frame_rate_index == 0 || s->frame_rate_index > 13) {
av_log(avctx, AV_LOG_WARNING, "frame_rate_index %d is invalid\n",
s->frame_rate_index);
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->bit_rate = get_bits(&s->gb, 18) * 400;
if (get_bits1(&s->gb) == 0) { /* marker */
av_log(avctx, AV_LOG_ERROR, "Marker in sequence header missing\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->width = width;
s->height = height;
@@ -2124,7 +2124,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
if (show_bits(&s->gb, 23) != 0) {
av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
/* We set MPEG-2 parameters so that it emulates MPEG-1. */
@@ -2508,7 +2508,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame
*picture,
if (mb_y >= s2->mb_height) {
av_log(s2->avctx, AV_LOG_ERROR,
"slice below image (%d >= %d)\n", mb_y,
s2->mb_height);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!s2->last_picture_ptr) {
--
1.9.3 (Apple Git-50)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
