[FFmpeg-cvslog] mov: fix assigment check

Vittorio Giovara git at videolan.org
Sat Oct 25 05:28:54 CEST 2014


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Oct 20 14:11:25 2014 +0100| [50dbe6b3544fa64d5611e16553bf542fd71276b8] | committer: Vittorio Giovara

mov: fix assigment check

CC: libav-stable at libav.org
Bug-Id: CID 1197050

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

 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0e29bf3..efc9314 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3192,7 +3192,7 @@ static int mov_read_header(AVFormatContext *s)
         MOVStreamContext *sc = st->priv_data;
 
         if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-            if (st->codec->width <= 0 && st->codec->width <= 0) {
+            if (st->codec->width <= 0 || st->codec->height <= 0) {
                 st->codec->width  = sc->width;
                 st->codec->height = sc->height;
             }



More information about the ffmpeg-cvslog mailing list