OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
813cc7a
)
movenc: fix tkhd height for imx
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Tue, 1 Mar 2011 23:36:48 +0000
(23:36 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 3 Mar 2011 13:15:09 +0000
(14:15 +0100)
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
fffdee89cc0712ed3324bae1f86e271a36c02822
)
libavformat/movenc.c
patch
|
blob
|
history
diff --git
a/libavformat/movenc.c
b/libavformat/movenc.c
index
361db17
..
f3a4a96
100644
(file)
--- a/
libavformat/movenc.c
+++ b/
libavformat/movenc.c
@@
-1218,7
+1218,7
@@
static int mov_write_tkhd_tag(AVIOContext *pb, MOVTrack *track, AVStream *st)
track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
if(track->mode == MODE_MOV) {
avio_wb32(pb, track->enc->width << 16);
- avio_wb32(pb, track->
enc->
height << 16);
+ avio_wb32(pb, track->height << 16);
} else {
double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio);
if(!sample_aspect_ratio || track->height != track->enc->height)