diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-16 14:20:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-16 14:20:37 +0100 |
| commit | 2d0440f93f93d2f92947dabb481b3e56c099ea26 (patch) | |
| tree | f1f5405ae9a68ad21b439e7c71fdc224c49c6f6f | |
| parent | aee51ee8b9b87b16bd1ecced9d984344f8d4d4ea (diff) | |
| parent | 3941df546276b190cc9362fd093e6721e8e52f50 (diff) | |
| download | ffmpeg-2d0440f93f93d2f92947dabb481b3e56c099ea26.tar.gz | |
Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'
* commit '3941df546276b190cc9362fd093e6721e8e52f50':
aea: Return proper error code on invalid header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/aea.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aea.c b/libavformat/aea.c index 4ace52a32d..db415c9543 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -78,7 +78,7 @@ static int aea_read_header(AVFormatContext *s) if (st->codec->channels != 1 && st->codec->channels != 2) { av_log(s,AV_LOG_ERROR,"Channels %d not supported!\n",st->codec->channels); - return -1; + return AVERROR_INVALIDDATA; } st->codec->channel_layout = (st->codec->channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; |