diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:40:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:40:18 +0200 |
| commit | 8c766228c180d183fecccb625432edf179965ad9 (patch) | |
| tree | c6cd3604414163e9cbb0fe5081df17b7d627cb3b /libavformat | |
| parent | 50138a9235b06b71a65e6ba9abba0ad0c9c64af0 (diff) | |
| parent | f2b00a5372bfa1d82a8ab99cb8eafac8a9473494 (diff) | |
Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'
* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494':
movenc: Return a proper error code for invalid combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d21906b406..67fb827756 100644 --- a/libavformat/movenc.c +++ b/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); } |