diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-05-09 22:16:14 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-05-09 22:16:14 +0000 |
| commit | 8b82a9567547f1ca7ab54f97982e180f42795664 (patch) | |
| tree | 2c00a56ee1166a3421470397d759f0573303d4eb /libavcodec/mpegvideo.c | |
| parent | a466e345e41253aa2c8cf9d62ff32be8d2cde0fa (diff) | |
| download | ffmpeg-8b82a9567547f1ca7ab54f97982e180f42795664.tar.gz | |
svq3 decoder by anonymous
Originally committed as revision 1845 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ea24c2a488..c0dd96bbec 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -928,7 +928,7 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) s->mb_skiped = 0; - assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264); + assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); /* mark&release old frames */ if (s->pict_type != B_TYPE && s->last_picture_ptr) { @@ -973,7 +973,7 @@ alloc: s->current_picture= *s->current_picture_ptr; - if(s->out_format != FMT_H264){ + if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){ if (s->pict_type != B_TYPE) { s->last_picture_ptr= s->next_picture_ptr; s->next_picture_ptr= s->current_picture_ptr; |