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

avcodec/mpeg4videodec: replace some return -1 by more specific error codes

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-15 17:24:36 +01:00
parent 18fcdc0981
commit 10411afdff
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpeg4videodec.c
View File

@@ -1763,7 +1763,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
s->avctx->framerate.num = get_bits(gb, 16); s->avctx->framerate.num = get_bits(gb, 16);
if (!s->avctx->framerate.num) { if (!s->avctx->framerate.num) {
av_log(s->avctx, AV_LOG_ERROR, "framerate==0\n"); av_log(s->avctx, AV_LOG_ERROR, "framerate==0\n");
return -1; return AVERROR_INVALIDDATA;
} }
ctx->time_increment_bits = av_log2(s->avctx->framerate.num - 1) + 1; ctx->time_increment_bits = av_log2(s->avctx->framerate.num - 1) + 1;
@@ -1829,7 +1829,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
"%d sprite_warping_points\n", "%d sprite_warping_points\n",
ctx->num_sprite_warping_points); ctx->num_sprite_warping_points);
ctx->num_sprite_warping_points = 0; ctx->num_sprite_warping_points = 0;
return -1; return AVERROR_INVALIDDATA;
} }
s->sprite_warping_accuracy = get_bits(gb, 2); s->sprite_warping_accuracy = get_bits(gb, 2);
ctx->sprite_brightness_change = get_bits1(gb); ctx->sprite_brightness_change = get_bits1(gb);
@@ -2374,7 +2374,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (get_bits_left(gb) < 3) { if (get_bits_left(gb) < 3) {
av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n"); av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n");
return -1; return AVERROR_INVALIDDATA;
} }
ctx->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)]; ctx->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)];
if (!s->progressive_sequence) { if (!s->progressive_sequence) {
@@ -2413,7 +2413,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (s->qscale == 0) { if (s->qscale == 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Error, header damaged or not MPEG4 header (qscale=0)\n"); "Error, header damaged or not MPEG4 header (qscale=0)\n");
return -1; // makes no sense to continue, as there is nothing left from the image then return AVERROR_INVALIDDATA; // makes no sense to continue, as there is nothing left from the image then
} }
if (s->pict_type != AV_PICTURE_TYPE_I) { if (s->pict_type != AV_PICTURE_TYPE_I) {
@@ -2422,7 +2422,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Error, header damaged or not MPEG4 header (f_code=0)\n"); "Error, header damaged or not MPEG4 header (f_code=0)\n");
s->f_code = 1; s->f_code = 1;
return -1; // makes no sense to continue, as there is nothing left from the image then return AVERROR_INVALIDDATA; // makes no sense to continue, as there is nothing left from the image then
} }
} else } else
s->f_code = 1; s->f_code = 1;
@@ -2433,7 +2433,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Error, header damaged or not MPEG4 header (b_code=0)\n"); "Error, header damaged or not MPEG4 header (b_code=0)\n");
s->b_code=1; s->b_code=1;
return -1; // makes no sense to continue, as the MV decoding will break very quickly return AVERROR_INVALIDDATA; // makes no sense to continue, as the MV decoding will break very quickly
} }
} else } else
s->b_code = 1; s->b_code = 1;