[FFmpeg-cvslog] Fix issue1503, this fix may be incomplete we need more samples to know for sure.
Michael Niedermayer
git at videolan.org
Tue Apr 26 03:00:28 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 26 01:45:17 2011 +0200| [05815b3545c2f8718ab25f455d51ea88be43e9c5] | committer: Michael Niedermayer
Fix issue1503, this fix may be incomplete we need more samples to know for sure.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05815b3545c2f8718ab25f455d51ea88be43e9c5
---
libavcodec/wmadec.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index fa20bea..3601e47 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -102,6 +102,13 @@ static int wma_decode_init(AVCodecContext * avctx)
s->use_bit_reservoir = flags2 & 0x0002;
s->use_variable_block_len = flags2 & 0x0004;
+ if(avctx->codec->id == CODEC_ID_WMAV2 && avctx->extradata_size >= 8){
+ if(!AV_RL16(extradata+6) && s->use_variable_block_len){
+ av_log(avctx, AV_LOG_WARNING, "Disabling use_variable_block_len, if this fails contact the ffmpeg developers and send us the file\n");
+ s->use_variable_block_len= 0; // this fixes issue1503
+ }
+ }
+
if(ff_wma_init(avctx, flags2)<0)
return -1;
More information about the ffmpeg-cvslog
mailing list