summaryrefslogtreecommitdiffstats
path: root/libmpdemux/mpeg_hdr.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-07-30 18:40:46 +0200
committerwm4 <wm4@nowhere>2012-07-30 22:14:32 +0200
commit1fde09db6f4cee7347842261234082470dd3a2ca (patch)
treec05bf64b1b397a62e6f0b9cf295a6f9d0266eed2 /libmpdemux/mpeg_hdr.h
parent17b69493b70413326c95c3c552009626809b45ec (diff)
downloadmpv-1fde09db6f4cee7347842261234082470dd3a2ca.tar.bz2
mpv-1fde09db6f4cee7347842261234082470dd3a2ca.tar.xz
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()).
Diffstat (limited to 'libmpdemux/mpeg_hdr.h')
-rw-r--r--libmpdemux/mpeg_hdr.h55
1 files changed, 0 insertions, 55 deletions
diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h
deleted file mode 100644
index ccd84bcdb0..0000000000
--- a/libmpdemux/mpeg_hdr.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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_MPEG_HDR_H
-#define MPLAYER_MPEG_HDR_H
-
-typedef struct {
- // video info:
- int mpeg1; // 0=mpeg2 1=mpeg1
- int display_picture_width;
- int display_picture_height;
- int aspect_ratio_information;
- int frame_rate_code;
- float fps;
- int frame_rate_extension_n;
- int frame_rate_extension_d;
- int bitrate; // 0x3FFFF==VBR
- // timing:
- int picture_structure;
- int progressive_sequence;
- int repeat_first_field;
- int progressive_frame;
- int top_field_first;
- int display_time; // secs*100
- //the following are for mpeg4
- unsigned int timeinc_resolution, timeinc_bits, timeinc_unit;
- int picture_type;
-} mp_mpeg_header_t;
-
-int mp_header_process_sequence_header (mp_mpeg_header_t * picture, const unsigned char * buffer);
-int mp_header_process_extension (mp_mpeg_header_t * picture, unsigned char * buffer);
-float mpeg12_aspect_info(mp_mpeg_header_t *picture);
-int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer);
-void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer);
-int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len);
-int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len);
-
-unsigned char mp_getbits(unsigned char *buffer, unsigned int from, unsigned char len);
-
-#endif /* MPLAYER_MPEG_HDR_H */