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:
8c87658
)
Revert "avcodec/gsmdec: reject unsupported msn audio modes"
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 26 Nov 2013 11:38:03 +0000
(12:38 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 26 Nov 2013 11:38:03 +0000
(12:38 +0100)
they should be supported now
This reverts commit
1ee1a3d9f4e152b641f05d2be6dbe3f440485cca
.
libavcodec/gsmdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/gsmdec.c
b/libavcodec/gsmdec.c
index
077056a
..
c4cde92
100644
(file)
--- a/
libavcodec/gsmdec.c
+++ b/
libavcodec/gsmdec.c
@@
-34,14
+34,6
@@
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)