[FFmpeg-cvslog] avformat/mov: Fix width/height typo

Michael Niedermayer git at videolan.org
Sat Apr 5 23:13:11 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  5 22:49:17 2014 +0200| [af2e5061bbcabf5eae780929fa25784b6127759e] | committer: Michael Niedermayer

avformat/mov: Fix width/height typo

Fixes CID1197050
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af2e5061bbcabf5eae780929fa25784b6127759e
---

 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index c711be1..ffb2573 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3478,7 +3478,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->width <= 0) {
+            if (st->codec->width <= 0 && st->codec->height <= 0) {
                 st->codec->width  = sc->width;
                 st->codec->height = sc->height;
             }



More information about the ffmpeg-cvslog mailing list