RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Baptiste Coudurier 2006-04-19 14:18:13 +00:00
parent b6c1bfe097
commit 3cb4ee5124
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@ -967,13 +967,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
get_be32(pb); /* vendor */ get_be32(pb); /* vendor */
get_be32(pb); /* temporal quality */ get_be32(pb); /* temporal quality */
get_be32(pb); /* spacial quality */ get_be32(pb); /* spacial quality */
if(st->codec->codec_id == CODEC_ID_MPEG4){ //FIXME this is silly
get_be16(pb); st->codec->width = get_be16(pb); /* width */
get_be16(pb); st->codec->height = get_be16(pb); /* height */
}else{
st->codec->width = get_be16(pb); /* width */
st->codec->height = get_be16(pb); /* height */
}
get_be32(pb); /* horiz resolution */ get_be32(pb); /* horiz resolution */
get_be32(pb); /* vert resolution */ get_be32(pb); /* vert resolution */
get_be32(pb); /* data size, always 0 */ get_be32(pb); /* data size, always 0 */