summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/avidec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 82acc2a7c1..7634a95e9d 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -488,8 +488,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
break;
case CODEC_TYPE_AUDIO:
get_wav_header(pb, st->codec, size);
- if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align)
+ if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){
av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align);
+ ast->sample_size= st->codec->block_align;
+ }
if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
url_fskip(pb, 1);
/* Force parsing as several audio frames can be in