summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-06-17 00:29:26 +0300
committerMartin Storsjö <martin@martin.st>2012-06-18 22:00:35 +0300
commit9e74db685063170d8f30191a17cd16769488d156 (patch)
tree35b628443659b029b2f14a787362a9b0dd7046e3 /libavformat/movenc.c
parent3641b0489ce8517ae4ce75ea43c1445b6d1ad2f2 (diff)
mov: Support muxing/demuxing iLBC
The packet size, signalled via block_align, has to be passed via the container. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index bf888bc3be..350ac951f6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3095,7 +3095,8 @@ static int mov_write_header(AVFormatContext *s)
}else if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO){
track->timescale = st->codec->sample_rate;
/* set sample_size for PCM and ADPCM */
- if (av_get_bits_per_sample(st->codec->codec_id)) {
+ if (av_get_bits_per_sample(st->codec->codec_id) ||
+ st->codec->codec_id == CODEC_ID_ILBC) {
if (!st->codec->block_align) {
av_log(s, AV_LOG_ERROR, "track %d: codec block align is not set\n", i);
goto error;