[FFmpeg-cvslog] avformat/movenc: Remove always true check

Andreas Rheinhardt git at videolan.org
Sun Feb 28 18:43:27 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Feb 23 21:19:26 2021 +0100| [f87b33b5bfe780bfd3dc949514dd71758ebaaf0f] | committer: Andreas Rheinhardt

avformat/movenc: Remove always true check

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f87b33b5bfe780bfd3dc949514dd71758ebaaf0f
---

 libavformat/movenc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 545b0885ae..cdfcbd3d76 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -6395,7 +6395,6 @@ static int mov_init(AVFormatContext *s)
     /* Default mode == MP4 */
     mov->mode = MODE_MP4;
 
-    if (s->oformat) {
         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;
@@ -6403,7 +6402,6 @@ static int mov_init(AVFormatContext *s)
         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("f4v", s->oformat->name)) mov->mode = MODE_F4V;
-    }
 
     if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
         mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;



More information about the ffmpeg-cvslog mailing list