mirror of https://git.ffmpeg.org/ffmpeg.git
10l (overwriting w/h with 0)
Originally committed as revision 4289 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7dc9ed1155
commit
d57b7316c5
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue