Merge commit '3941df54'

* commit '3941df54':
  aea: Return proper error code on invalid header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;