From d57b7316c50c92b94f6e642dd3b54b0ad869265e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 May 2005 02:06:45 +0000 Subject: [PATCH] 10l (overwriting w/h with 0) Originally committed as revision 4289 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 88239f18dc..b6e1d36338 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -840,16 +840,13 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) get_be32(pb); /* vendor */ get_be32(pb); /* temporal quality */ get_be32(pb); /* spacial quality */ - st->codec.width = get_be16(pb); /* width */ - st->codec.height = get_be16(pb); /* height */ -#if 1 - if (st->codec.codec_id == CODEC_ID_MPEG4) { - /* in some MPEG4 the width/height are not correct, so - we ignore this info */ - st->codec.width = 0; - st->codec.height = 0; + if(st->codec.codec_id == CODEC_ID_MPEG4){ //FIXME this is silly + get_be16(pb); + get_be16(pb); + }else{ + st->codec.width = get_be16(pb); /* width */ + st->codec.height = get_be16(pb); /* height */ } -#endif get_be32(pb); /* horiz resolution */ get_be32(pb); /* vert resolution */ get_be32(pb); /* data size, always 0 */