summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-01-20 13:14:12 -0800
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-01-24 14:20:48 -0800
commitd4e0130e4655cafa2123062330f5db1aeade1ef2 (patch)
treecba7205bcdd1d95f2f3fc2bdcdaa61ef193975ea /libavformat/mov.c
parente7b95918fca1c3d057d35f77ba58ee2d00d03151 (diff)
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.
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 4370b48bc5..6c1985d3ff 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: