aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-10-20 14:11:25 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-01-13 00:04:56 +0100
commit26ba78adacd8469fca97c8c833e2e6364b13b7c8 (patch)
treec253d4e7186c5843065a39563ee25b97c3f82cb0
parent8a982092cc3436c25d68ec15b27277c176ce0061 (diff)
downloadffmpeg-26ba78adacd8469fca97c8c833e2e6364b13b7c8.tar.gz
mov: fix assigment check
CC: libav-stable@libav.org Bug-Id: CID 1197050
-rw-r--r--libavformat/mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9077b7d042..d14dc7c745 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3092,7 +3092,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;
}