mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/movenc: Remove always true check
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
85ab9deb98
commit
f87b33b5bf
|
@ -6395,7 +6395,6 @@ static int mov_init(AVFormatContext *s)
|
||||||
/* Default mode == MP4 */
|
/* Default mode == MP4 */
|
||||||
mov->mode = MODE_MP4;
|
mov->mode = MODE_MP4;
|
||||||
|
|
||||||
if (s->oformat) {
|
|
||||||
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;
|
||||||
|
@ -6403,7 +6402,6 @@ static int mov_init(AVFormatContext *s)
|
||||||
else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD;
|
else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD;
|
||||||
else if (!strcmp("ismv",s->oformat->name)) mov->mode = MODE_ISM;
|
else if (!strcmp("ismv",s->oformat->name)) mov->mode = MODE_ISM;
|
||||||
else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V;
|
else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V;
|
||||||
}
|
|
||||||
|
|
||||||
if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
|
if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
|
||||||
mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;
|
mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;
|
||||||
|
|
Loading…
Reference in New Issue