[Ffmpeg-cvslog] r5776 - in trunk: libavcodec/vp3.c libavformat/oggparsetheora.c
michael
subversion
Mon Jul 17 12:44:54 CEST 2006
Author: michael
Date: Mon Jul 17 12:44:53 2006
New Revision: 5776
Modified:
trunk/libavcodec/vp3.c
trunk/libavformat/oggparsetheora.c
Log:
fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%)
Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c (original)
+++ trunk/libavcodec/vp3.c Mon Jul 17 12:44:53 2006
@@ -2628,8 +2628,10 @@
skip_bits(gb, 24); /* frame height */
}
+ if (s->theora >= 0x030200) {
skip_bits(gb, 8); /* offset x */
skip_bits(gb, 8); /* offset y */
+ }
skip_bits(gb, 32); /* fps numerator */
skip_bits(gb, 32); /* fps denumerator */
@@ -2818,6 +2820,8 @@
}
if(8*op_bytes != get_bits_count(&gb))
av_log(avctx, AV_LOG_ERROR, "%d bits left in packet %X\n", 8*op_bytes - get_bits_count(&gb), ptype);
+ if (s->theora < 0x030200)
+ break;
}
vp3_decode_init(avctx);
Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c (original)
+++ trunk/libavformat/oggparsetheora.c Mon Jul 17 12:44:53 2006
@@ -75,7 +75,7 @@
if (version >= 0x030400)
skip_bits(&gb, 164);
- else
+ else if (version >= 0x030200)
skip_bits(&gb, 64);
st->codec->time_base.den = get_bits(&gb, 32);
st->codec->time_base.num = get_bits(&gb, 32);
More information about the ffmpeg-cvslog
mailing list