Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-10-20 17:11:25 +0400
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-10-25 02:48:57 +0400
commit50dbe6b3544fa64d5611e16553bf542fd71276b8 (patch)
treeaaf96756f962807072e73fa010b67f202122c220 /libavformat
parent7df3b426bbfbd7efd9a0f56393e3cc78413b0869 (diff)
mov: fix assigment check
CC: libav-stable@libav.org Bug-Id: CID 1197050
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0e29bf3f23..efc9314087 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;
}