[FFmpeg-cvslog] r17929 - trunk/libavformat/movenc.c

[bcoudurier]

Author: bcoudurier
Date: Wed Mar 11 07:04:56 2009
New Revision: 17929

Log:
fix subs track height, set track->height to codec height if not set

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Wed Mar 11 02:36:25 2009	(r17928)
+++ trunk/libavformat/movenc.c	Wed Mar 11 07:04:56 2009	(r17929)
@@ -1681,8 +1681,7 @@ static int mov_write_header(AVFormatCont
                     return -1;
                 }
                 track->height = track->tag>>24 == 'n' ? 486 : 576;
-            } else
-                track->height = st->codec->height;
+            }
             track->timescale = st->codec->time_base.den;
             av_set_pts_info(st, 64, 1, st->codec->time_base.den);
             if (track->mode == MODE_MOV && track->timescale > 100000)
@@ -1712,6 +1711,8 @@ static int mov_write_header(AVFormatCont
             track->timescale = st->codec->time_base.den;
             av_set_pts_info(st, 64, 1, st->codec->time_base.den);
         }
+        if (!track->height)
+            track->height = st->codec->height;
     }
 
     mov_write_mdat_tag(pb, mov);