git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* all : can now read mp4 file with mp3 audio declared in mp4a box
[vlc.git]
/
plugins
/
mp4
/
mp4.h
diff --git
a/plugins/mp4/mp4.h
b/plugins/mp4/mp4.h
index
23487fd
..
03ab88a
100644
(file)
--- a/
plugins/mp4/mp4.h
+++ b/
plugins/mp4/mp4.h
@@
-2,7
+2,7
@@
* mp4.h : MP4 file input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* mp4.h : MP4 file input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: mp4.h,v 1.
2 2002/07/21 15:13:19
fenrir Exp $
+ * $Id: mp4.h,v 1.
4 2002/07/21 19:57:22
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
@@
-214,10
+214,16
@@
static struct
{ FOURCC_mp4v, MPEG4_VIDEO_ES, "MP4VisualSampleEntry (MPEG-4)" },
{ FOURCC_3IV1, UNKNOWN_ES, "3IV1 SampleEntry" },
{ FOURCC_cvid, CINEPAK_VIDEO_ES,"cvid SampleEntry (Cinepak Video Codec)" },
{ FOURCC_mp4v, MPEG4_VIDEO_ES, "MP4VisualSampleEntry (MPEG-4)" },
{ FOURCC_3IV1, UNKNOWN_ES, "3IV1 SampleEntry" },
{ FOURCC_cvid, CINEPAK_VIDEO_ES,"cvid SampleEntry (Cinepak Video Codec)" },
+ { FOURCC_mjpa, UNKNOWN_ES, "MJPEG-A SampleEntry (Motion JPEG)" },
+ { FOURCC_mjpb, UNKNOWN_ES, "MJPEG-A SampleEntry (Motion JPEG)" },
+ { FOURCC_jpeg, UNKNOWN_ES, "JPEG (ISO) SampleEntry" },
/* Audio codec */
{ FOURCC_soun, UNKNOWN_ES, "Generic AudioSampleEntry" },
/* Audio codec */
{ FOURCC_soun, UNKNOWN_ES, "Generic AudioSampleEntry" },
- { FOURCC_mp4a, UNKNOWN_ES, "MP4AudioSampleEntry (AAC)" },
+ /* The things with mp4a is that we could have aac audio but
+ also mpeg audio, depend on objectTypeIndication,
+ it would be probe later */
+ { FOURCC_mp4a, MPEG2_AUDIO_ES, "MP4AudioSampleEntry (MPEGAUDIO-AAC)" },
{ FOURCC__mp3, MPEG2_AUDIO_ES, ".mp3 SampleEntry (MPEG-I/II layer 3)" },
/* Last entry with fourcc == 0 */
{ FOURCC__mp3, MPEG2_AUDIO_ES, ".mp3 SampleEntry (MPEG-I/II layer 3)" },
/* Last entry with fourcc == 0 */