diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:57:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:57:48 +0200 |
| commit | eeb9242b623c76bdda0ef842cf95d3dc03ca3b60 (patch) | |
| tree | 25319e951aded067c9ed6845c54a43c66945d2af | |
| parent | 48579041bae5e19177b0d09e3b9cfcfc33d440d8 (diff) | |
| parent | 50dbe6b3544fa64d5611e16553bf542fd71276b8 (diff) | |
| download | ffmpeg-eeb9242b623c76bdda0ef842cf95d3dc03ca3b60.tar.gz | |
Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'
* commit '50dbe6b3544fa64d5611e16553bf542fd71276b8':
mov: fix assigment check
Conflicts:
libavformat/mov.c
See: af2e5061bbcabf5eae780929fa25784b6127759e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 1444bcedf7..f81b1092f2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3923,7 +3923,7 @@ static int mov_read_header(AVFormatContext *s) av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, sc->time_scale*(int64_t)sc->nb_frames_for_fps, sc->duration_for_fps, INT_MAX); if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { - if (st->codec->width <= 0 && st->codec->height <= 0) { + if (st->codec->width <= 0 || st->codec->height <= 0) { st->codec->width = sc->width; st->codec->height = sc->height; } |