Merge commit 'f2b00a53'

* commit 'f2b00a53':
  movenc: Return a proper error code for invalid combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/movenc.c

@@ -3655,7 +3655,7 @@ static int mov_write_header(AVFormatContext *s)
     if (!s->pb->seekable &&
         (!(mov->flags & FF_MOV_FLAG_FRAGMENT) || mov->ism_lookahead)) {
         av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     mov_write_ftyp_tag(pb,s);
@@ -3673,7 +3673,7 @@ static int mov_write_header(AVFormatContext *s)
 
         if (video_streams_nb != 1 || audio_streams_nb != 1 || other_streams_nb) {
             av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
-            return -1;
+            return AVERROR(EINVAL);
         }
         mov_write_uuidprof_tag(pb, s);
     }