virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf/movenc: remove useless checks on AVOutputFormat

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Matthieu Bouron
2013-07-28 16:46:04 +02:00
committed by Michael Niedermayer
parent 2186a7e547
commit ee4ef139e3
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/movenc.c
View File

@@ -3538,7 +3538,7 @@ static int mov_write_header(AVFormatContext *s)
* is enabled, we don't support non-seekable output at all. */
if (!s->pb->seekable &&
((!(mov->flags & FF_MOV_FLAG_FRAGMENT) &&
!(s->oformat && !strcmp(s->oformat->name, "ismv")))
strcmp(s->oformat->name, "ismv"))
|| mov->ism_lookahead)) {
av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
return -1;
@@ -3547,7 +3547,6 @@ static int mov_write_header(AVFormatContext *s)
/* Default mode == MP4 */
mov->mode = MODE_MP4;
if (s->oformat != NULL) {
if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;
else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
@@ -3564,7 +3563,6 @@ static int mov_write_header(AVFormatContext *s)
}
mov_write_uuidprof_tag(pb, s);
}
}
mov->nb_streams = s->nb_streams;
if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters)