OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bbbd959
)
avcodec/gsmdec: reject unsupported msn audio modes
author
Piotr Bandurski
<ami_stuff@o2.pl>
Tue, 13 Aug 2013 21:09:24 +0000
(23:09 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 Aug 2013 21:59:39 +0000
(23:59 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/gsmdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/gsmdec.c
b/libavcodec/gsmdec.c
index
dc64267
..
5de6da4
100644
(file)
--- a/
libavcodec/gsmdec.c
+++ b/
libavcodec/gsmdec.c
@@
-34,6
+34,14
@@
static av_cold int gsm_init(AVCodecContext *avctx)
{
+ if (avctx->codec_tag == 0x0032 &&
+ avctx->bit_rate != 13000 &&
+ avctx->bit_rate != 17912 &&
+ avctx->bit_rate != 35824 &&
+ avctx->bit_rate != 71656) {
+ av_log(avctx, AV_LOG_ERROR, "Unsupported audio mode\n");
+ return AVERROR_PATCHWELCOME;
+ }
avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO;
if (!avctx->sample_rate)