diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-11 06:04:56 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-11 06:04:56 +0000 |
| commit | a2523ce2e27f91026bd1753427f430ee41edb706 (patch) | |
| tree | 432e66734ec760b9ce3b4b3f5f6b54a2fd470d43 | |
| parent | 3596f4e076f48905b360e6b6635165de759758b6 (diff) | |
| download | ffmpeg-a2523ce2e27f91026bd1753427f430ee41edb706.tar.gz | |
fix subs track height, set track->height to codec height if not set
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f7af1b9186..77cd01d460 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1681,8 +1681,7 @@ static int mov_write_header(AVFormatContext *s) 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(AVFormatContext *s) 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); |