diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-05-12 17:58:52 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-05-12 17:58:52 +0000 |
| commit | 25fa62e13ae89a1ecc995e2e90cb40123debba1c (patch) | |
| tree | 1cea970efbd4e26c84f119c47fdddccc5dafd99c /libavformat | |
| parent | 9ed83b0a93814124bcbc2747a9475fb3c1d3d943 (diff) | |
* added s263 (mapped to h263 - 3gp files)
* less strict header detection - also do not call exit when it's not found.
Originally committed as revision 1864 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 8d60a4b379..2c274bb71c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -89,6 +89,7 @@ static const CodecTag mov_video_tags[] = { { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ /* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */ + { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ /* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */ @@ -1288,9 +1289,10 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) /* check MOV header */ err = mov_read_default(mov, pb, atom); - if(err<0 || (!mov->found_moov || !mov->found_mdat)) { - puts("header not found !!!"); - exit(1); + if (err<0 || (!mov->found_moov && !mov->found_mdat)) { + fprintf(stderr, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%Ld\n", + err, mov->found_moov, mov->found_mdat, url_ftell(pb)); + return -1; } #ifdef DEBUG printf("on_parse_exit_offset=%d\n", (int) url_ftell(pb)); |