diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-06-01 21:17:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-06-01 21:17:05 +0000 |
| commit | 29b29011e5631c4e867baf42258a00886d142841 (patch) | |
| tree | 42a8c6bb5cd7b6e81f79474722044b6509c70cd0 | |
| parent | 1fee8b3a8c53f33b5943e29eb4f86de05562eca4 (diff) | |
| download | ffmpeg-29b29011e5631c4e867baf42258a00886d142841.tar.gz | |
fix skipped blocks
fixes decoding of (http://samples.mplayerhq.hu/game-formats/idroq/bf2introseg.roq)
Originally committed as revision 9168 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/roqvideo.h | 1 | ||||
| -rw-r--r-- | libavcodec/roqvideodec.c | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 72b3e1de33..dace062b8c 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -38,7 +38,6 @@ typedef struct RoqContext { AVFrame frames[2]; AVFrame *last_frame; AVFrame *current_frame; - int first_frame; int y_stride; int c_stride; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index bb14cafa87..6f1cb30368 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -92,7 +92,6 @@ static void roqvideo_decode_frame(RoqContext *ri) switch(vqid) { case RoQ_ID_MOT: - ff_apply_motion_8x8(ri, xp, yp, 0, 0); break; case RoQ_ID_FCC: mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8)); @@ -122,7 +121,6 @@ static void roqvideo_decode_frame(RoqContext *ri) vqflg_pos--; switch(vqid) { case RoQ_ID_MOT: - ff_apply_motion_4x4(ri, x, y, 0, 0); break; case RoQ_ID_FCC: mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8)); @@ -167,7 +165,6 @@ static int roq_decode_init(AVCodecContext *avctx) RoqContext *s = avctx->priv_data; s->avctx = avctx; - s->first_frame = 1; s->last_frame = &s->frames[0]; s->current_frame = &s->frames[1]; avctx->pix_fmt = PIX_FMT_YUV420P; @@ -182,7 +179,7 @@ static int roq_decode_frame(AVCodecContext *avctx, { RoqContext *s = avctx->priv_data; - if (avctx->get_buffer(avctx, s->current_frame)) { + if (avctx->reget_buffer(avctx, s->current_frame)) { av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n"); return -1; } @@ -193,12 +190,6 @@ static int roq_decode_frame(AVCodecContext *avctx, s->size = buf_size; roqvideo_decode_frame(s); - /* release the last frame if it is allocated */ - if (s->first_frame) - s->first_frame = 0; - else - avctx->release_buffer(avctx, s->last_frame); - *data_size = sizeof(AVFrame); *(AVFrame*)data = *s->current_frame; @@ -215,6 +206,8 @@ static int roq_decode_end(AVCodecContext *avctx) /* release the last frame */ if (s->last_frame->data[0]) avctx->release_buffer(avctx, s->last_frame); + if (s->current_frame->data[0]) + avctx->release_buffer(avctx, s->current_frame); return 0; } |