X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=plugins%2Fmp4%2Fmp4.h;h=03ab88a24a4c463134acbcd615ba90f8c973263a;hp=23487fd2e4eb0dd7d2c8f6beece34971049619b2;hb=54c0e5d7a957a367f8e1b92bcfe354846aac7993;hpb=ff3794bc53e42bd665f665bdce34baf501116618 diff --git a/plugins/mp4/mp4.h b/plugins/mp4/mp4.h index 23487fd2e4..03ab88a24a 100644 --- 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 - * $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 * * 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_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" }, - { 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 */