Skip to content

F
ffmpeg.wasm-core
Commit ee4ef139 authored by Matthieu Bouron's avatar Matthieu Bouron Committed by Michael Niedermayer
Browse files
Options

lavf/movenc: remove useless checks on AVOutputFormat 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 2186a7e5
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 17 deletions
libavformat/movenc.c
View file @ ee4ef139
...@@ -3538,7 +3538,7 @@ static int mov_write_header(AVFormatContext *s) ...@@ -3538,7 +3538,7 @@ static int mov_write_header(AVFormatContext *s)
* is enabled, we don't support non-seekable output at all. */ * is enabled, we don't support non-seekable output at all. */
if (!s->pb->seekable && if (!s->pb->seekable &&
((!(mov->flags & FF_MOV_FLAG_FRAGMENT) && ((!(mov->flags & FF_MOV_FLAG_FRAGMENT) &&
!(s->oformat && !strcmp(s->oformat->name, "ismv"))) strcmp(s->oformat->name, "ismv"))
|| mov->ism_lookahead)) { || 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 -1;
...@@ -3547,7 +3547,6 @@ static int mov_write_header(AVFormatContext *s) ...@@ -3547,7 +3547,6 @@ static int mov_write_header(AVFormatContext *s)
/* Default mode == MP4 */ /* Default mode == MP4 */
mov->mode = MODE_MP4; mov->mode = MODE_MP4;
if (s->oformat != NULL) {
if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP; 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("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;
else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV; else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
...@@ -3564,7 +3563,6 @@ static int mov_write_header(AVFormatContext *s) ...@@ -3564,7 +3563,6 @@ static int mov_write_header(AVFormatContext *s)
} }
mov_write_uuidprof_tag(pb, s); mov_write_uuidprof_tag(pb, s);
} }
}
mov->nb_streams = s->nb_streams; mov->nb_streams = s->nb_streams;
if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters) if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment