From c5a837658acd3e65029e6c8b52dd6cdffdb608b0 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 9 Dec 2013 13:51:00 +0100 Subject: [PATCH 1/2] Do not detect "00000000..." (and other non-changing values) as adp. --- libavformat/adp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/adp.c b/libavformat/adp.c index c5feac4fa5..08a4225e46 100644 --- a/libavformat/adp.c +++ b/libavformat/adp.c @@ -26,14 +26,21 @@ static int adp_probe(AVProbeData *p) { - int i; + int i, changes = 0; + char last = 0; if (p->buf_size < 32) return 0; - for (i = 0; i < p->buf_size - 3; i+=32) + for (i = 0; i < p->buf_size - 3; i+=32) { if (p->buf[i] != p->buf[i+2] || p->buf[i+1] != p->buf[i+3]) return 0; + if (p->buf[i] != last) + changes++; + last = p->buf[i]; + } + if (changes <= 1) + return 0; return p->buf_size < 260 ? 1 : AVPROBE_SCORE_MAX / 4; } From 362383b743f3a379675ff4b310d357893a6a872e Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 9 Dec 2013 14:24:46 +0100 Subject: [PATCH 2/2] Fix remuxing of IMA_QT in mov. Fixes ticket #1603. --- libavformat/movenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 92ce5341e6..7315417ca2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3885,7 +3885,8 @@ static int mov_write_header(AVFormatContext *s) }else{ track->sample_size = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels; } - if (st->codec->codec_id == AV_CODEC_ID_ILBC) { + if (st->codec->codec_id == AV_CODEC_ID_ILBC || + st->codec->codec_id == AV_CODEC_ID_ADPCM_IMA_QT) { track->audio_vbr = 1; } if (track->mode != MODE_MOV &&