Merge commit '50dbe6b3'

* commit '50dbe6b3':
  mov: fix assigment check

Conflicts:
	libavformat/mov.c

See: af2e5061Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;
             }