diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-05-09 23:54:05 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-05-09 23:54:05 +0000 |
| commit | 2501ad08791d23b9b925f073644ef3ebbab8f66e (patch) | |
| tree | 83b9cab2862a5bfc1e1b534c0d62af391a524fa1 /src/libffmpeg/libavcodec/mpegvideo.c | |
| parent | 111c5a7f3161338352c6261085536523decc4943 (diff) | |
| download | xine-lib-2501ad08791d23b9b925f073644ef3ebbab8f66e.tar.gz xine-lib-2501ad08791d23b9b925f073644ef3ebbab8f66e.tar.bz2 | |
enable ffmpeg's open source SVQ3 decoder
CVS patchset: 4809
CVS date: 2003/05/09 23:54:05
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegvideo.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c index ea24c2a48..c0dd96bbe 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.c +++ b/src/libffmpeg/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; |