aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-12-06 22:44:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-12-06 22:44:03 +0000
commitbc17df09d4d8cef550b1af99923d204f31b91dc6 (patch)
treeb0ce0f6c2dbef0f007dad12b2e5b1847b932941a /libavcodec
parent80016c48b07fac94f0bf3470a7322c2a022256a0 (diff)
downloadffmpeg-bc17df09d4d8cef550b1af99923d204f31b91dc6.tar.gz
seeking in rm
Originally committed as revision 3737 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/rv10.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 7dc3ea21f6..c544438dde 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -400,20 +400,28 @@ static int rv20_decode_picture_header(MpegEncContext *s)
}
if(s->avctx->has_b_frames){
+ int f1=9;
+ int f2=9;
+ int f3=9;
+
if (get_bits(&s->gb, 1)){
-// av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n");
+ av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n");
// return -1;
}
seq= get_bits(&s->gb, 14)<<1;
if(s->avctx->extradata_size >= 4 && ((uint8_t*)s->avctx->extradata)[1]&1){
- get_bits(&s->gb, 1);
+ f1= get_bits(&s->gb, 1);
}
if(s->avctx->extradata_size >= 4 && ((uint8_t*)s->avctx->extradata)[1]&2){
- get_bits(&s->gb, 1);
+ f2= get_bits(&s->gb, 1);
}
if(s->avctx->extradata_size >= 4 && ((uint8_t*)s->avctx->extradata)[1]&4){
- get_bits(&s->gb, 2);
+ f3= get_bits(&s->gb, 2);
+ }
+
+ if(s->avctx->debug & FF_DEBUG_PICT_INFO){
+ av_log(s->avctx, AV_LOG_DEBUG, "F %d %d %d\n", f1,f2,f3);
}
mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
@@ -733,6 +741,7 @@ AVCodec rv20_decoder = {
NULL,
rv10_decode_end,
rv10_decode_frame,
- CODEC_CAP_DR1
+ CODEC_CAP_DR1,
+ .flush= ff_mpeg_flush,
};