Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'

* commit '0528226a05cc08b74197547fba0b1939bf68990d':
  a64: Return correct error code on invalid data stream

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/a64.c

@@ -37,7 +37,7 @@ static int a64_write_header(AVFormatContext *s)
 
     if (avctx->extradata_size < 4) {
         av_log(s, AV_LOG_ERROR, "Missing extradata\n");
-        return AVERROR(EINVAL);
+        return AVERROR_INVALIDDATA;
     }
 
     switch (avctx->codec->id) {
@@ -52,7 +52,7 @@ static int a64_write_header(AVFormatContext *s)
         header[4] = 3;
         break;
     default:
-        return AVERROR(EINVAL);
+        return AVERROR_INVALIDDATA;
     }
     avio_write(s->pb, header, 2);
     return 0;