summaryrefslogtreecommitdiffstats
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-01-25 15:08:20 +0000
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-01-28 01:06:57 +0100
commitf2589642172d284a67e5bbd6c11c477a2aacda88 (patch)
tree98e3b2c0c70c6979709e2c1d33a564bf4d0a9faa /libavformat/mov.c
parent37cb3eb53449ccefbbe8ea7dc5e66f9036aafe6e (diff)
downloadffmpeg-streaming-f2589642172d284a67e5bbd6c11c477a2aacda88.zip
ffmpeg-streaming-f2589642172d284a67e5bbd6c11c477a2aacda88.tar.gz
In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 18a9238..ea9423b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1227,6 +1227,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, ByteIOContext *pb, int entries)
case CODEC_ID_GSM:
case CODEC_ID_ADPCM_MS:
case CODEC_ID_ADPCM_IMA_WAV:
+ st->codec->frame_size = sc->samples_per_frame;
st->codec->block_align = sc->bytes_per_frame;
break;
case CODEC_ID_ALAC:
OpenPOWER on IntegriCloud