mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-06-19 19:03:00 +02:00
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:
+4
-7
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user