diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-31 18:29:43 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-31 18:29:43 +0000 |
| commit | 5350f2b7701f01bc4f234d3971fb8a623a8cd72a (patch) | |
| tree | 5f6cd350778863ad8d2612bce4ac2f6270919115 /src/libffmpeg/libavcodec/svq1.c | |
| parent | 8b0e8647a0d0c279b6a355362452dff4bd6f5c05 (diff) | |
| download | xine-lib-5350f2b7701f01bc4f234d3971fb8a623a8cd72a.tar.gz xine-lib-5350f2b7701f01bc4f234d3971fb8a623a8cd72a.tar.bz2 | |
update ffmpeg
CVS patchset: 4068
CVS date: 2003/01/31 18:29:43
Diffstat (limited to 'src/libffmpeg/libavcodec/svq1.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/svq1.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/svq1.c b/src/libffmpeg/libavcodec/svq1.c index 77035f1f9..5a9a290b8 100644 --- a/src/libffmpeg/libavcodec/svq1.c +++ b/src/libffmpeg/libavcodec/svq1.c @@ -1066,7 +1066,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *pict = data; /* initialize bit buffer */ - init_get_bits(&s->gb,buf,buf_size); + init_get_bits(&s->gb,buf,buf_size*8); /* decode frame header */ s->f_code = get_bits (&s->gb, 22); @@ -1093,6 +1093,10 @@ static int svq1_decode_frame(AVCodecContext *avctx, return result; } + //FIXME this avoids some confusion for "B frames" without 2 references + //this should be removed after libavcodec can handle more flaxible picture types & ordering + if(s->pict_type==B_TYPE && s->last_picture.data[0]==NULL) return buf_size; + if(avctx->hurry_up && s->pict_type==B_TYPE) return buf_size; if(MPV_frame_start(s, avctx) < 0) |