comparison mov.c @ 133:31f0dda651f8 libavformat

* added s263 (mapped to h263 - 3gp files) * less strict header detection - also do not call exit when it's not found.
author kabi
date Mon, 12 May 2003 17:58:52 +0000
parents 9ca36221ae23
children 5cda954c6e9a
comparison
equal deleted inserted replaced
132:9ca36221ae23 133:31f0dda651f8
87 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */ 87 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
88 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, 88 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
89 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ 89 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
90 /* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ 90 /* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
91 { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */ 91 { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
92 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
92 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ 93 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
93 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ 94 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
94 /* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */ 95 /* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */
95 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */ 96 { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */
96 { CODEC_ID_NONE, 0 }, 97 { CODEC_ID_NONE, 0 },
1286 printf("filesz=%Ld\n", atom.size); 1287 printf("filesz=%Ld\n", atom.size);
1287 #endif 1288 #endif
1288 1289
1289 /* check MOV header */ 1290 /* check MOV header */
1290 err = mov_read_default(mov, pb, atom); 1291 err = mov_read_default(mov, pb, atom);
1291 if(err<0 || (!mov->found_moov || !mov->found_mdat)) { 1292 if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
1292 puts("header not found !!!"); 1293 fprintf(stderr, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%Ld\n",
1293 exit(1); 1294 err, mov->found_moov, mov->found_mdat, url_ftell(pb));
1295 return -1;
1294 } 1296 }
1295 #ifdef DEBUG 1297 #ifdef DEBUG
1296 printf("on_parse_exit_offset=%d\n", (int) url_ftell(pb)); 1298 printf("on_parse_exit_offset=%d\n", (int) url_ftell(pb));
1297 #endif 1299 #endif
1298 /* some cleanup : make sure we are on the mdat atom */ 1300 /* some cleanup : make sure we are on the mdat atom */