diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-04-19 14:18:13 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-04-19 14:18:13 +0000 |
| commit | 3cb4ee51245c806fd840f7ec32c7a3c50a808839 (patch) | |
| tree | 05b50642b66afa12eb20448d9f9046fc34d47553 /libavformat | |
| parent | b6c1bfe097478d1b647d205c390c9a6f008512ae (diff) | |
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
Originally committed as revision 5303 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index de60364fb3..71043c6d6b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -967,13 +967,10 @@ 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 */ - 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 */ - } + + st->codec->width = get_be16(pb); /* width */ + st->codec->height = get_be16(pb); /* height */ + get_be32(pb); /* horiz resolution */ get_be32(pb); /* vert resolution */ get_be32(pb); /* data size, always 0 */ |