aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-08-04 12:33:34 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-08-04 12:33:34 +0000
commit74e9b9ae702b50c58d106f56d27a08572e73280d (patch)
treef6b83b3fe57ec31d93ce4f666e10acfd2d327add
parent1ae7a851160d088292657bb30de21e980e22dffd (diff)
downloadffmpeg-74e9b9ae702b50c58d106f56d27a08572e73280d.tar.gz
set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
Originally committed as revision 9895 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mov.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index f0b7d320bb..68c81dede4 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -844,6 +844,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */
st->need_parsing = AVSTREAM_PARSE_FULL;
break;
+ case CODEC_ID_ADPCM_MS:
+ case CODEC_ID_ADPCM_IMA_WAV:
+ st->codec->block_align = sc->bytes_per_frame;
+ break;
default:
break;
}