Remove some demuxers and decoders

Most of these demuxers and decoders are provided in better form by
libav, while the mplayer builtin ones are essentially unmaintained. The
only legimitate use case for not using the libav ones was working around
libav bugs or bugs related to the way mplayer uses libav. Instead of
trying to keep dead code alive, development effort should go into
improving libav or the mplayer libav glue code.

Note that the libav demuxer have been preferred over the mplayer builtin
ones for a while in mplayer2. There were some exceptions: playing DVDs
with dvdnav or playing network sources. (That's because some stream
modules and network.c requested explicit file formats, such as
DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this
commit, they are switched to use libav. One caveat is that the requested
format is not passed to libavformat, instead we rely on the auto probing
to select the correct libav demuxer (see code in demux_open_stream()).

1 files changed, 0 insertions, 127 deletions

diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h
deleted file mode 100644
index 27d4d44d7d..0000000000
--- a/libmpdemux/parse_mp4.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * MP4 file format parser code
- *
- * Copyright (C) 2002 Felix Buenemann <atmosfear at users.sourceforge.net>
- * Code inspired by libmp4 from http://mpeg4ip.sourceforge.net/.
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_PARSE_MP4_H
-#define MPLAYER_PARSE_MP4_H
-
-#include <inttypes.h>
-
-/* one byte tag identifiers */
-#define MP4ODescrTag			0x01
-#define MP4IODescrTag			0x02
-#define MP4ESDescrTag			0x03
-#define MP4DecConfigDescrTag		0x04
-#define MP4DecSpecificDescrTag		0x05
-#define MP4SLConfigDescrTag		0x06
-#define MP4ContentIdDescrTag		0x07
-#define MP4SupplContentIdDescrTag	0x08
-#define MP4IPIPtrDescrTag		0x09
-#define MP4IPMPPtrDescrTag		0x0A
-#define MP4IPMPDescrTag			0x0B
-#define MP4RegistrationDescrTag		0x0D
-#define MP4ESIDIncDescrTag		0x0E
-#define MP4ESIDRefDescrTag		0x0F
-#define MP4FileIODescrTag		0x10
-#define MP4FileODescrTag		0x11
-#define MP4ExtProfileLevelDescrTag	0x13
-#define MP4ExtDescrTagsStart		0x80
-#define MP4ExtDescrTagsEnd		0xFE
-
-/* object type identifiers in the ESDS */
-/* See http://gpac.sourceforge.net/tutorial/mediatypes.htm */
-/* BIFS stream version 1 */
-#define MP4OTI_MPEG4Systems1                                0x01
-/* BIFS stream version 2 */
-#define MP4OTI_MPEG4Systems2                                0x02
-/* MPEG-4 visual stream */
-#define MP4OTI_MPEG4Visual                                  0x20
-/* MPEG-4 audio stream */
-#define MP4OTI_MPEG4Audio                                   0x40
-/* MPEG-2 visual streams with various profiles */
-#define MP4OTI_MPEG2VisualSimple                            0x60
-#define MP4OTI_MPEG2VisualMain                              0x61
-#define MP4OTI_MPEG2VisualSNR                               0x62
-#define MP4OTI_MPEG2VisualSpatial                           0x63
-#define MP4OTI_MPEG2VisualHigh                              0x64
-#define MP4OTI_MPEG2Visual422                               0x65
-/* MPEG-2 audio stream part 7 ("AAC") with various profiles */
-#define MP4OTI_MPEG2AudioMain                               0x66
-#define MP4OTI_MPEG2AudioLowComplexity                      0x67
-#define MP4OTI_MPEG2AudioScaleableSamplingRate              0x68
-/* MPEG-2 audio part 3 ("MP3") */
-#define MP4OTI_MPEG2AudioPart3                              0x69
-/* MPEG-1 visual visual stream */
-#define MP4OTI_MPEG1Visual                                  0x6A
-/* MPEG-1 audio stream part 3 ("MP3") */
-#define MP4OTI_MPEG1Audio                                   0x6B
-/* JPEG visual stream */
-#define MP4OTI_JPEG                                         0x6C
-/* 3GPP2 */
-#define MP4OTI_13kVoice                                     0xE1
-
-/* I define uint24 here for better understanding */
-#ifndef uint24_t
-#define uint24_t uint32_t
-#endif
-
-/* esds_t */
-typedef struct {
-  uint8_t  version;
-  uint24_t flags;
-
-  /* 0x03 ESDescrTag */
-  uint16_t ESId;
-  uint8_t  streamPriority;
-
-  /* 0x04 DecConfigDescrTag */
-  uint8_t  objectTypeId;
-  uint8_t  streamType;
-  /* XXX: really streamType is
-   * only 6bit, followed by:
-   * 1bit  upStream
-   * 1bit  reserved
-   */
-  uint24_t bufferSizeDB;
-  uint32_t maxBitrate;
-  uint32_t avgBitrate;
-
-  /* 0x05 DecSpecificDescrTag */
-  uint16_t  decoderConfigLen;
-  uint8_t *decoderConfig;
-
-  /* 0x06 SLConfigDescrTag */
-  uint8_t  SLConfigLen;
-  uint8_t *SLConfig;
-
-  /* TODO: add the missing tags,
-   * I currently have no specs
-   * for them and doubt they
-   * are currently needed ::atmos
-   */
-
-} esds_t;
-
-int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds);
-void mp4_free_esds(esds_t *esds);
-
-#endif /* MPLAYER_PARSE_MP4_H */