---
libavcodec/msmpeg4dec.c | 56 ++++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 191f81a..a05dc25 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -101,7 +101,7 @@ static int msmpeg4v2_decode_motion(MpegEncContext * s, int
pred, int f_code)
static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64])
{
- int cbp, code, i;
+ int cbp, code, i, ret;
if (s->pict_type == AV_PICTURE_TYPE_P) {
if (s->use_skip_mb_code) {
@@ -125,7 +125,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t
block[6][64])
code = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table,
INTER_MCBPC_VLC_BITS, 2);
if(code<0 || code>7){
av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code,
s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->mb_intra = code >>2;
@@ -139,7 +139,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t
block[6][64])
cbp= get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table,
INTRA_MCBPC_VLC_BITS, 1);
if(cbp<0 || cbp>3){
av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp,
s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
}
@@ -149,7 +149,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t
block[6][64])
cbpy= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
if(cbpy<0){
av_log(s->avctx, AV_LOG_ERROR, "cbpy %d invalid at %d %d\n", cbp,
s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
cbp|= cbpy<<2;
@@ -176,10 +176,10 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s,
int16_t block[6][64])
s->bdsp.clear_blocks(s->block[0]);
for (i = 0; i < 6; i++) {
- if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1,
NULL) < 0)
+ if ((ret = ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) &
1, NULL)) < 0)
{
av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d
x %d (%d)\n", s->mb_x, s->mb_y, i);
- return -1;
+ return ret;
}
}
return 0;
@@ -187,7 +187,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t
block[6][64])
static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64])
{
- int cbp, code, i;
+ int cbp, code, i, ret;
uint8_t *coded_val;
uint32_t * const mb_type_ptr = &s->current_picture.mb_type[s->mb_x +
s->mb_y*s->mb_stride];
@@ -211,7 +211,7 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t
block[6][64])
code = get_vlc2(&s->gb,
ff_mb_non_intra_vlc[DEFAULT_INTER_INDEX].table, MB_NON_INTRA_VLC_BITS, 3);
if (code < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
//s->mb_intra = (code & 0x40) ? 0 : 1;
s->mb_intra = (~code & 0x40) >> 6;
@@ -220,7 +220,7 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t
block[6][64])
s->mb_intra = 1;
code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
if (code < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
/* predict coded block pattern */
cbp = 0;
for(i=0;i<6;i++) {
@@ -241,8 +241,8 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t
block[6][64])
s->rl_chroma_table_index = s->rl_table_index;
}
ff_h263_pred_motion(s, 0, 0, &mx, &my);
- if (ff_msmpeg4_decode_motion(s, &mx, &my) < 0)
- return -1;
+ if ((ret = ff_msmpeg4_decode_motion(s, &mx, &my)) < 0)
+ return ret;
s->mv_dir = MV_DIR_FORWARD;
s->mv_type = MV_TYPE_16X16;
s->mv[0][0][0] = mx;
@@ -267,10 +267,10 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s,
int16_t block[6][64])
s->bdsp.clear_blocks(s->block[0]);
for (i = 0; i < 6; i++) {
- if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1,
NULL) < 0)
+ if ((ret = ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) &
1, NULL)) < 0)
{
av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x
%d (%d)\n", s->mb_x, s->mb_y, i);
- return -1;
+ return ret;
}
}
@@ -282,11 +282,11 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
{
MpegEncContext *s = avctx->priv_data;
static int done = 0;
- int i;
+ int i, ret;
MVTable *mv;
- if (ff_h263_decode_init(avctx) < 0)
- return -1;
+ if ((ret = ff_h263_decode_init(avctx)) < 0)
+ return ret;
ff_msmpeg4_common_init(s);
@@ -394,7 +394,7 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
int start_code = get_bits_long(&s->gb, 32);
if(start_code!=0x00000100){
av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
skip_bits(&s->gb, 5); // frame number */
@@ -404,7 +404,7 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
if (s->pict_type != AV_PICTURE_TYPE_I &&
s->pict_type != AV_PICTURE_TYPE_P){
av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
#if 0
{
@@ -416,7 +416,7 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
if(s->qscale==0){
av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (s->pict_type == AV_PICTURE_TYPE_I) {
@@ -424,7 +424,7 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
if(s->msmpeg4_version==1){
if(code==0 || code>s->mb_height){
av_log(s->avctx, AV_LOG_ERROR, "invalid slice height %d\n",
code);
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->slice_height = code;
@@ -432,7 +432,7 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
/* 0x17: one slice, 0x18: two slices, ... */
if (code < 0x17){
av_log(s->avctx, AV_LOG_ERROR, "error, slice code was %X\n",
code);
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->slice_height = s->mb_height / (code - 0x16);
@@ -580,7 +580,7 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int
*dir_ptr)
level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, DC_VLC_BITS, 3);
}
if (level < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
level-=256;
}else{ //FIXME optimize use unified tables & index
if (n < 4) {
@@ -590,7 +590,7 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int
*dir_ptr)
}
if (level < 0){
av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (level == DC_MAX) {
@@ -646,19 +646,19 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t *
block,
if (level < 0){
av_log(s->avctx, AV_LOG_ERROR, "dc overflow- block: %d qscale:
%d//\n", n, s->qscale);
if(s->inter_intra_pred) level=0;
- else return -1;
+ else return level;
}
if (n < 4) {
rl = &ff_rl_table[s->rl_table_index];
if(level > 256*s->y_dc_scale){
av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ L qscale:
%d//\n", s->qscale);
- if(!s->inter_intra_pred) return -1;
+ if(!s->inter_intra_pred) return AVERROR_INVALIDDATA;
}
} else {
rl = &ff_rl_table[3 + s->rl_chroma_table_index];
if(level > 256*s->c_dc_scale){
av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ C qscale:
%d//\n", s->qscale);
- if(!s->inter_intra_pred) return -1;
+ if(!s->inter_intra_pred) return AVERROR_INVALIDDATA;
}
}
block[0] = level;
@@ -837,7 +837,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t *
block,
break;
}else{
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d
%d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
}
@@ -873,7 +873,7 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s,
code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2);
if (code < 0){
av_log(s->avctx, AV_LOG_ERROR, "illegal MV code at %d %d\n", s->mb_x,
s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (code == mv->n) {
mx = get_bits(&s->gb, 6);
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
