[FFmpeg-cvslog] movenc: Return a proper error code for invalid combinations

Martin Storsjö git at videolan.org
Mon Sep 23 14:45:04 CEST 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Sep 22 14:44:17 2013 +0300| [f2b00a5372bfa1d82a8ab99cb8eafac8a9473494] | committer: Martin Storsjö

movenc: Return a proper error code for invalid combinations

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2b00a5372bfa1d82a8ab99cb8eafac8a9473494
---

 libavformat/movenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index f4bd990..1fe850b 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3179,7 +3179,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);
     }
 
 
@@ -3187,7 +3187,7 @@ static int mov_write_header(AVFormatContext *s)
     if (mov->mode == MODE_PSP) {
         if (s->nb_streams != 2) {
             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);
     }



More information about the ffmpeg-cvslog mailing list