aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-05-16 18:32:35 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-05-17 11:38:17 +0200
commit4c49d0824a10b319c021a1df90abab5a45a644dc (patch)
tree016b448280867c1a464babb07c219b7ea20a6658
parentbe1fbc02b8c3a069d64881d02a3c0a92b273b36c (diff)
downloadffmpeg-4c49d0824a10b319c021a1df90abab5a45a644dc.tar.gz
Fix alaw and mulaw muxing in caf.
Fixes ticket #3644.
-rw-r--r--libavformat/cafenc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index f94101ab02..8926f0f2f7 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
@@ -131,8 +131,6 @@ static int caf_write_header(AVFormatContext *s)
case AV_CODEC_ID_PCM_F32BE:
case AV_CODEC_ID_PCM_F64LE:
case AV_CODEC_ID_PCM_F64BE:
- case AV_CODEC_ID_PCM_ALAW:
- case AV_CODEC_ID_PCM_MULAW:
codec_tag = MKTAG('l','p','c','m');
}