Mercurial > libavformat.hg

changeset 4695:bf48da0d792e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix subs track height, set track->height to codec height if not set
author bcoudurier
date Wed, 11 Mar 2009 06:04:56 +0000
parents 6b1e0c3211d6
children ee1ca2a4e43f
files movenc.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/movenc.c	Wed Mar 11 01:36:25 2009 +0000
+++ b/movenc.c	Wed Mar 11 06:04:56 2009 +0000
@@ -1681,8 +1681,7 @@
                     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 @@
             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);