Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'

* commit '3941df546276b190cc9362fd093e6721e8e52f50':
  aea: Return proper error code on invalid header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/105/head
Michael Niedermayer 10 years ago
commit 2d0440f93f
  1. 2
      libavformat/aea.c

@ -78,7 +78,7 @@ static int aea_read_header(AVFormatContext *s)
if (st->codec->channels != 1 && st->codec->channels != 2) { if (st->codec->channels != 1 && st->codec->channels != 2) {
av_log(s,AV_LOG_ERROR,"Channels %d not supported!\n",st->codec->channels); 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; st->codec->channel_layout = (st->codec->channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;

Loading…
Cancel
Save