diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:29:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:30:15 +0100 |
| commit | 97a55f00d35cb28497002329a17ab2f39a554cea (patch) | |
| tree | 60004050216488b60ad1b459eba74e37e566dcd6 | |
| parent | b6cd6da17329d65922626ff71eabdeff2e692032 (diff) | |
| parent | 26ba78adacd8469fca97c8c833e2e6364b13b7c8 (diff) | |
| download | ffmpeg-97a55f00d35cb28497002329a17ab2f39a554cea.tar.gz | |
Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4
* commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8':
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 12fa707c7b..c8b3f75eac 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3645,7 +3645,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; } |