diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-10-09 12:35:22 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-10-09 12:35:22 +0000 |
| commit | d017ab70f4ade39717db101ac93dd36a7e592754 (patch) | |
| tree | 1ee0c359bd6a6d02c7f088147f4a40c6d7517bfc /libavcodec/dv.c | |
| parent | f20dca4020fdff4d9d0cdec5f51bf3c33f1bc9ef (diff) | |
| download | ffmpeg-streaming-d017ab70f4ade39717db101ac93dd36a7e592754.zip ffmpeg-streaming-d017ab70f4ade39717db101ac93dd36a7e592754.tar.gz | |
support buffers containing more than one frame
Originally committed as revision 1016 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dv.c')
| -rw-r--r-- | libavcodec/dv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index aaab0ab..3271490 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -494,7 +494,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, UINT8 *buf, int buf_size) { DVVideoDecodeContext *s = avctx->priv_data; - int sct, dsf, apt, ds, nb_dif_segs, vs, size, width, height, i; + int sct, dsf, apt, ds, nb_dif_segs, vs, size, width, height, i, packet_size; UINT8 *buf_ptr; const UINT16 *mb_pos_ptr; AVPicture *picture; @@ -531,17 +531,18 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, /* init size */ width = 720; if (dsf) { - if (buf_size != PAL_FRAME_SIZE) - return -1; + packet_size = PAL_FRAME_SIZE; height = 576; nb_dif_segs = 12; } else { - if (buf_size != NTSC_FRAME_SIZE) - return -1; + packet_size = NTSC_FRAME_SIZE; height = 480; nb_dif_segs = 10; } - + /* NOTE: we only accept several full frames */ + if (buf_size < packet_size) + return -1; + /* XXX: is it correct to assume that 420 is always used in PAL mode ? */ s->sampling_411 = !dsf; @@ -604,8 +605,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, picture->data[i] = s->current_picture[i]; picture->linesize[i] = s->linesize[i]; } - - return buf_size; + return packet_size; } static int dvvideo_decode_end(AVCodecContext *avctx) |
