diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-01 19:16:18 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-01 19:16:18 +0000 |
| commit | a512446ed33e68bf22d7245d60ebc911df72e647 (patch) | |
| tree | e5f2b9172cf462b8963abd14d7deb52381c580aa /libavformat/mov.c | |
| parent | 02799762c618fa7519066f568627774f7cee60db (diff) | |
| download | ffmpeg-a512446ed33e68bf22d7245d60ebc911df72e647.tar.gz | |
clean, always write major brand for debug
Originally committed as revision 6862 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 8dc9972e74..6eb3193269 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -506,25 +506,7 @@ static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { uint32_t type = get_le32(pb); - /* from mplayer */ - switch (type) { - case MKTAG('i', 's', 'o', 'm'): - case MKTAG('m', 'p', '4', '1'): - case MKTAG('m', 'p', '4', '2'): - case MKTAG('3', 'g', 'p', '1'): - case MKTAG('3', 'g', 'p', '2'): - case MKTAG('3', 'g', '2', 'a'): - case MKTAG('3', 'g', 'p', '3'): - case MKTAG('3', 'g', 'p', '4'): - case MKTAG('3', 'g', 'p', '5'): - case MKTAG('m', 'm', 'p', '4'): /* Mobile MP4 */ - case MKTAG('M', '4', 'A', ' '): /* Apple iTunes AAC-LC Audio */ - case MKTAG('M', '4', 'P', ' '): /* Apple iTunes AAC-LC Protected Audio */ - case MKTAG('m', 'j', 'p', '2'): /* Motion Jpeg 2000 */ - case MKTAG('q', 't', ' ', ' '): - default: - av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); - } + av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); get_be32(pb); /* minor version */ url_fskip(pb, atom.size - 8); return 0; |