Mercurial > libavformat.hg
changeset 1067:3d7fae1dfda4 libavformat
skip null fourcc, fix ep2_mystery_m640_dummy.mov
| author | bcoudurier |
|---|---|
| date | Mon, 01 May 2006 15:52:57 +0000 |
| parents | 716c75917a10 |
| children | b14b8b976bce |
| files | mov.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mov.c Sun Apr 23 13:47:13 2006 +0000 +++ b/mov.c Mon May 01 15:52:57 2006 +0000 @@ -944,15 +944,11 @@ 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 @@ 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 */