Mercurial > libavformat.hg

changeset 3105:2b9c6bfc04a5 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use block_align as the avi spec says. fix issue274
author michael
date Mon, 03 Mar 2008 01:27:15 +0000
parents 0f8d91124c84
children ed30b032fa7b
files avidec.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/avidec.c	Mon Mar 03 01:23:18 2008 +0000
+++ b/avidec.c	Mon Mar 03 01:27:15 2008 +0000
@@ -488,8 +488,10 @@
                     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