aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g729dec.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-18 00:23:02 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-18 00:23:02 +0000
commitfd7cbc7f9c385dee88548862f87d4f6cf76aa0a9 (patch)
tree0e3f4011c928dab70ab18c8dc5d76affd33c0252 /libavcodec/g729dec.c
parent8d5e638f045919141cdd9821bfa869b2d8c1568e (diff)
downloadandroid_external_ffmpeg-fd7cbc7f9c385dee88548862f87d4f6cf76aa0a9.tar.gz
android_external_ffmpeg-fd7cbc7f9c385dee88548862f87d4f6cf76aa0a9.tar.bz2
android_external_ffmpeg-fd7cbc7f9c385dee88548862f87d4f6cf76aa0a9.zip
Make g729dec.c:decoder_init() return AVERROR(EINVAL) rather than
AVERROR(NOFMT) if one channel if the number of channels specified is different than 1. Originally committed as revision 22591 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/g729dec.c')
-rw-r--r--libavcodec/g729dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index bebad4aa2e..c1cdb5dcc4 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -171,7 +171,7 @@ static av_cold int decoder_init(AVCodecContext * avctx)
if (avctx->channels != 1) {
av_log(avctx, AV_LOG_ERROR, "Only mono sound is supported (requested channels: %d).\n", avctx->channels);
- return AVERROR_NOFMT;
+ return AVERROR(EINVAL);
}
/* Both 8kbit/s and 6.4kbit/s modes uses two subframes per frame. */