diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-05-01 15:52:57 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-05-01 15:52:57 +0000 |
| commit | a20da52cbfc40ffc4b662a996bc7acd5ef587c38 (patch) | |
| tree | 97d58a9957f0858fc33031422a9396b1260d0762 /libavformat/mov.c | |
| parent | c51ba67a988dc76b81a56ee1d674cf51ee59fa96 (diff) | |
| download | ffmpeg-a20da52cbfc40ffc4b662a996bc7acd5ef587c38.tar.gz | |
skip null fourcc, fix ep2_mystery_m640_dummy.mov
Originally committed as revision 5340 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 71043c6d6b..6147d1f849 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -944,15 +944,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) get_be16(pb); /* reserved */ get_be16(pb); /* index */ - dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n", - size, - (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff, - st->codec->codec_type); st->codec->codec_tag = format; id = codec_get_id(mov_audio_tags, format); if (id > 0) { st->codec->codec_type = CODEC_TYPE_AUDIO; - } else if (format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */ + } else if (format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */ id = codec_get_id(mov_video_tags, format); if (id <= 0) id = codec_get_id(codec_bmp_tags, format); @@ -960,6 +956,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->codec_type = CODEC_TYPE_VIDEO; } + dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n", + size, + (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff, + st->codec->codec_type); + if(st->codec->codec_type==CODEC_TYPE_VIDEO) { st->codec->codec_id = id; get_be16(pb); /* version */ |