diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2004-05-21 14:37:16 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-21 14:37:16 +0000 |
commit | 53db1cae1c2d555d207563e0197809faf23b3dcc (patch) | |
tree | 1d4141bca722343f1a1d3fb004f52a5269865787 | |
parent | 5da42be1921604a97e6180f242c78c484a179314 (diff) | |
download | ffmpeg-streaming-53db1cae1c2d555d207563e0197809faf23b3dcc.zip ffmpeg-streaming-53db1cae1c2d555d207563e0197809faf23b3dcc.tar.gz |
data_size = 0 cleanup
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/4xm.c | 2 | ||||
-rw-r--r-- | libavcodec/a52dec.c | 1 | ||||
-rw-r--r-- | libavcodec/ac3dec.c | 1 | ||||
-rw-r--r-- | libavcodec/adpcm.c | 2 | ||||
-rw-r--r-- | libavcodec/amr.c | 3 | ||||
-rw-r--r-- | libavcodec/asv1.c | 2 | ||||
-rw-r--r-- | libavcodec/cljr.c | 2 | ||||
-rw-r--r-- | libavcodec/cyuv.c | 2 | ||||
-rw-r--r-- | libavcodec/dv.c | 1 | ||||
-rw-r--r-- | libavcodec/ffv1.c | 2 | ||||
-rw-r--r-- | libavcodec/flac.c | 2 | ||||
-rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
-rw-r--r-- | libavcodec/h264.c | 2 | ||||
-rw-r--r-- | libavcodec/huffyuv.c | 2 | ||||
-rw-r--r-- | libavcodec/indeo3.c | 1 | ||||
-rw-r--r-- | libavcodec/mace.c | 1 | ||||
-rw-r--r-- | libavcodec/mjpeg.c | 6 | ||||
-rw-r--r-- | libavcodec/mpeg12.c | 2 | ||||
-rw-r--r-- | libavcodec/mpegaudiodec.c | 1 | ||||
-rw-r--r-- | libavcodec/oggvorbis.c | 1 | ||||
-rw-r--r-- | libavcodec/raw.c | 1 | ||||
-rw-r--r-- | libavcodec/roqvideo.c | 2 | ||||
-rw-r--r-- | libavcodec/rv10.c | 3 | ||||
-rw-r--r-- | libavcodec/svq1.c | 4 | ||||
-rw-r--r-- | libavcodec/svq3.c | 2 | ||||
-rw-r--r-- | libavcodec/truemotion1.c | 2 | ||||
-rw-r--r-- | libavcodec/utils.c | 2 | ||||
-rw-r--r-- | libavcodec/vcr1.c | 2 | ||||
-rw-r--r-- | libavcodec/vmdav.c | 1 | ||||
-rw-r--r-- | libavcodec/vp3.c | 2 |
30 files changed, 2 insertions, 57 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 50dc4a5..fd84f89 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -600,8 +600,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, temp; int i, frame_4cc, frame_size; - *data_size = 0; - /* special case for last picture */ if (buf_size == 0) { return 0; diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c index a22391f..76c63b7 100644 --- a/libavcodec/a52dec.c +++ b/libavcodec/a52dec.c @@ -160,7 +160,6 @@ static int a52_decode_frame(AVCodecContext *avctx, 2, 1, 2, 3, 3, 4, 4, 5 }; - *data_size = 0; buf_ptr = buf; while (buf_size > 0) { len = s->inbuf_ptr - s->inbuf; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 53bfa56..fcfb314 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -92,7 +92,6 @@ static int ac3_decode_frame(AVCodecContext *avctx, 2, 1, 2, 3, 3, 4, 4, 5 }; - *data_size = 0; buf_ptr = buf; while (buf_size > 0) { len = s->inbuf_ptr - s->inbuf; diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 2ce7dc8..0755e24 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -568,7 +568,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, if(st) { /* handle stereo interlacing */ c->channel = (channel + 1) % 2; /* we get one packet for left, then one for right data */ if(channel == 1) { /* wait for the other packet before outputing anything */ - *data_size = 0; return src - buf; } } @@ -842,7 +841,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, } break; default: - *data_size = 0; return -1; } *data_size = (uint8_t *)samples - (uint8_t *)data; diff --git a/libavcodec/amr.c b/libavcodec/amr.c index 93f775b..7b097a2 100644 --- a/libavcodec/amr.c +++ b/libavcodec/amr.c @@ -221,7 +221,6 @@ static int amr_nb_decode_frame(AVCodecContext * avctx, Word16 serial[SERIAL_FRAMESIZE]; /* coded bits */ Word16 *synth; UWord8 *packed_bits; - *data_size=0; static Word16 packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0}; int i; @@ -416,7 +415,6 @@ static int amr_nb_decode_frame(AVCodecContext * avctx, static short block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 }; enum Mode dec_mode; int packet_size; - *data_size=0; //printf("amr_decode_frame data_size=%i buf=0x%X buf_size=%d frameCount=%d!!\n",*data_size,buf,buf_size,s->frameCount); @@ -603,7 +601,6 @@ static int amr_wb_decode_frame(AVCodecContext * avctx, int offset=0; int mode; int packet_size; - *data_size=0; while(offset<buf_size) { diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index 2491659..2ab729c 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -403,8 +403,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame * const p= (AVFrame*)&a->picture; int mb_x, mb_y; - *data_size = 0; - /* special case for last picture */ if (buf_size == 0) { return 0; diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 912a050..df1f798 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -43,8 +43,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame * const p= (AVFrame*)&a->picture; int x, y; - *data_size = 0; - /* special case for last picture */ if (buf_size == 0) { return 0; diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index aee2bc5..82bc210 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -81,8 +81,6 @@ static int cyuv_decode_frame(AVCodecContext *avctx, unsigned char cur_byte; int pixel_groups; - *data_size = 0; - /* sanity check the buffer size: A buffer has 3x16-bytes tables * followed by (height) lines each with 3 bytes to represent groups * of 4 pixels. Thus, the total size of the buffer ought to be: diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 8addf85..8e359e3 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -889,7 +889,6 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, { DVVideoContext *s = avctx->priv_data; - *data_size=0; /* special case for last picture */ if(buf_size==0) return 0; diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 01ab08a..a85baea 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -941,8 +941,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 AVFrame *picture = data; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) return 0; diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 38e0936..7e92fa5 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -546,8 +546,6 @@ static int flac_decode_frame(AVCodecContext *avctx, int tmp = 0, i, j = 0, input_buf_size; int16_t *samples = data, *left, *right; - *data_size = 0; - s->avctx = avctx; if(s->max_framesize == 0){ diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index ea8badb..1ffefa1 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -417,8 +417,6 @@ uint64_t time= rdtsc(); s->flags= avctx->flags; s->flags2= avctx->flags2; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) { /* special case for last picture */ diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 77c3393..594a4b2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5713,8 +5713,6 @@ static int decode_frame(AVCodecContext *avctx, s->flags= avctx->flags; s->flags2= avctx->flags2; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) { return 0; diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 210d454..ecc6a5f 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -684,8 +684,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 AVFrame *picture = data; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) return 0; diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 12f4ced..14ff028 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1058,7 +1058,6 @@ static int indeo3_decode_frame(AVCodecContext *avctx, /* no supplementary picture */ if (buf_size == 0) { - *data_size = 0; return 0; } diff --git a/libavcodec/mace.c b/libavcodec/mace.c index 1beac6c..8a4a205 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -421,7 +421,6 @@ puts("mace_decode_frame[6]()"); *data_size = 2 * 6 * buf_size; break; default: - *data_size = 0; return -1; } return buf_size; diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 78a620f..4e2305a 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -1724,8 +1724,6 @@ static int mjpeg_decode_frame(AVCodecContext *avctx, int start_code; AVFrame *picture = data; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) return 0; @@ -1902,8 +1900,6 @@ static int mjpegb_decode_frame(AVCodecContext *avctx, uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs; uint32_t field_size; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) return 0; @@ -2015,8 +2011,6 @@ static int sp5x_decode_frame(AVCodecContext *avctx, uint8_t *buf_ptr, *buf_end, *recoded; int i = 0, j = 0; - *data_size = 0; - /* no supplementary picture */ if (buf_size == 0) return 0; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 93e21af..c967908 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2791,8 +2791,6 @@ static int mpeg_decode_frame(AVCodecContext *avctx, MpegEncContext *s2 = &s->mpeg_enc_ctx; dprintf("fill_buffer\n"); - *data_size = 0; - /* special case for last picture */ if (buf_size == 0 && s2->low_delay==0 && s2->next_picture_ptr) { *picture= *(AVFrame*)s2->next_picture_ptr; diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index a9eed4e..f9cb389 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -2520,7 +2520,6 @@ static int decode_frame(AVCodecContext * avctx, int len, out_size; short *out_samples = data; - *data_size = 0; buf_ptr = buf; while (buf_size > 0) { len = s->inbuf_ptr - s->inbuf; diff --git a/libavcodec/oggvorbis.c b/libavcodec/oggvorbis.c index 1ae3b62..f24f4fa 100644 --- a/libavcodec/oggvorbis.c +++ b/libavcodec/oggvorbis.c @@ -264,7 +264,6 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext, if(!buf_size){ //FIXME flush - *data_size=0; return 0; } diff --git a/libavcodec/raw.c b/libavcodec/raw.c index ee4b6fd..8c554c4 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -118,7 +118,6 @@ static int raw_decode(AVCodecContext *avctx, if (buf_size < bytesNeeded) { memcpy(context->p, buf, buf_size); context->p += buf_size; - *data_size = 0; return buf_size; } diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c index bd26961..7d6b518 100644 --- a/libavcodec/roqvideo.c +++ b/libavcodec/roqvideo.c @@ -450,8 +450,6 @@ static int roq_decode_frame(AVCodecContext *avctx, { RoqContext *s = avctx->priv_data; - *data_size = 0; - if (avctx->get_buffer(avctx, &s->current_frame)) { av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n"); return -1; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index b67ec39..ade21db 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -651,7 +651,6 @@ static int rv10_decode_frame(AVCodecContext *avctx, /* no supplementary picture */ if (buf_size == 0) { - *data_size = 0; return 0; } @@ -685,8 +684,6 @@ static int rv10_decode_frame(AVCodecContext *avctx, } *data_size = sizeof(AVFrame); - }else{ - *data_size = 0; } return buf_size; diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index b4f8e03..a841816 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -600,7 +600,6 @@ static uint16_t svq1_packet_checksum (uint8_t *data, int length, int value) { return value; } -#if 0 static uint16_t svq1_component_checksum (uint16_t *pixels, int pitch, int width, int height, int value) { int x, y; @@ -615,7 +614,6 @@ static uint16_t svq1_component_checksum (uint16_t *pixels, int pitch, return value; } -#endif static void svq1_parse_string (GetBitContext *bitbuf, uint8_t *out) { uint8_t seed; @@ -715,8 +713,6 @@ static int svq1_decode_frame(AVCodecContext *avctx, int result, i, x, y, width, height; AVFrame *pict = data; - *data_size=0; - if(buf==NULL && buf_size==0){ return 0; } diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 413cc89..e064626 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -769,8 +769,6 @@ static int svq3_decode_frame (AVCodecContext *avctx, unsigned char *extradata; unsigned int size; - *data_size = 0; - s->flags = avctx->flags; s->flags2 = avctx->flags2; s->unrestricted_mv = 1; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 2f63101..b742d80 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -547,8 +547,6 @@ static int truemotion1_decode_frame(AVCodecContext *avctx, if (buf_size == 0) return 0; - *data_size = 0; - if (truemotion1_decode_header(s) == -1) return -1; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index df2a1e1..df5aebb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -488,6 +488,7 @@ int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, { int ret; + *got_picture_ptr= 0; ret = avctx->codec->decode(avctx, picture, got_picture_ptr, buf, buf_size); @@ -508,6 +509,7 @@ int avcodec_decode_audio(AVCodecContext *avctx, int16_t *samples, { int ret; + *frame_size_ptr= 0; ret = avctx->codec->decode(avctx, samples, frame_size_ptr, buf, buf_size); avctx->frame_number++; diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 0553945..9a706af 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -45,8 +45,6 @@ static int decode_frame(AVCodecContext *avctx, uint8_t *bytestream= buf; int i, x, y; - *data_size = 0; - /* special case for last picture */ if (buf_size == 0) { return 0; diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index c09af13..c11f80a 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -522,7 +522,6 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, if (buf_size < 16) return buf_size; - *data_size = 0; if (buf[6] == 1) { /* the chunk contains audio */ *data_size = vmdaudio_loadsound(s, output_samples, p, 0); diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 59d1835..e140ae3 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2474,8 +2474,6 @@ static int vp3_decode_frame(AVCodecContext *avctx, GetBitContext gb; static int counter = 0; - *data_size = 0; - init_get_bits(&gb, buf, buf_size * 8); if (s->theora && get_bits1(&gb)) |