diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-21 02:06:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-21 02:06:45 +0000 |
| commit | d57b7316c50c92b94f6e642dd3b54b0ad869265e (patch) | |
| tree | fcc37d929847f1a53e6c714981cfc182c7e27141 /libavformat/mov.c | |
| parent | 7dc9ed1155addbeffb99568fd33d16a08d5bb440 (diff) | |
| download | ffmpeg-d57b7316c50c92b94f6e642dd3b54b0ad869265e.tar.gz | |
10l (overwriting w/h with 0)
Originally committed as revision 4289 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 15 |
1 files 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 */ |