generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'

Browse Source 
* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494':
  movenc: Return a proper error code for invalid combinations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-23 14:40:06 +02:00
parent 50138a9235 f2b00a5372
commit 8c766228c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/movenc.c
View File

@@ -3655,7 +3655,7 @@ static int mov_write_header(AVFormatContext *s)
if (!s->pb->seekable && if (!s->pb->seekable &&
(!(mov->flags & FF_MOV_FLAG_FRAGMENT) || mov->ism_lookahead)) { (!(mov->flags & FF_MOV_FLAG_FRAGMENT) || mov->ism_lookahead)) {
av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n"); 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); 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) { 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"); 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); mov_write_uuidprof_tag(pb, s);
} }