projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a98209
)
mov: fix assigment check
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 20 Oct 2014 13:11:25 +0000
(14:11 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 12 Jan 2015 23:04:56 +0000
(
00:04
+0100)
CC: libav-stable@libav.org
Bug-Id: CID 1197050
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
9077b7d
..
d14dc7c
100644
(file)
--- 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;
}