aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-02-26 21:42:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 02:13:09 +0200
commit45432879ff415ec3e91d66ef5a19219ba7563ab9 (patch)
tree0adf8f2c6ee7c780450f9c72ec34333af9ec3ca6
parent77955dcabfce95b32f696d521f260d53b1ac3709 (diff)
downloadffmpeg-45432879ff415ec3e91d66ef5a19219ba7563ab9.tar.gz
avformat/bit: only accept the g729 codec and 1 channel
Other codecs/channel numbers are not supported by this muxer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d0b8640f75ff7569c98d6fdb03d83451104e088c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/bit.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/bit.c b/libavformat/bit.c
index 42df0c2fae..f5112c2fea 100644
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -119,8 +119,12 @@ static int write_header(AVFormatContext *s)
{
AVCodecContext *enc = s->streams[0]->codec;
- enc->codec_id = AV_CODEC_ID_G729;
- enc->channels = 1;
+ if ((enc->codec_id != AV_CODEC_ID_G729) || enc->channels != 1) {
+ av_log(s, AV_LOG_ERROR,
+ "only codec g729 with 1 channel is supported by this format\n");
+ return AVERROR(EINVAL);
+ }
+
enc->bits_per_coded_sample = 16;
enc->block_align = (enc->bits_per_coded_sample * enc->channels) >> 3;