summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-07 14:42:25 +0200
committerwm4 <wm4@nowhere>2012-09-18 21:07:30 +0200
commitae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e (patch)
tree20f50ce7713ffa7d671a86fc43b709354ae8991a /libmpdemux/demux_ts.h
parentc323592c3ac8557e09b8235bd43196f968e91168 (diff)
downloadmpv-ae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e.tar.bz2
mpv-ae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e.tar.xz
libmpdemux: add back demux_ts
Someone wanted this. Apparently both libavformat's TS demuxer and demux_ts are crap, and work/fail in different cases. This demuxer has been removed in 1fde09db6f4ce. All code added comes from the revision before that. Some required bits have been added in the commit before this one (re-adding demux_mpg), in particular the changes to video.c. stream_dvb will use this demuxer by default, otherwise demux_lavf is preferred (as it has been before). Some TS related command line options are not re-added. Closed captions might not work.
Diffstat (limited to 'libmpdemux/demux_ts.h')
-rw-r--r--libmpdemux/demux_ts.h24
1 files changed, 24 insertions, 0 deletions
diff --git a/libmpdemux/demux_ts.h b/libmpdemux/demux_ts.h
new file mode 100644
index 0000000000..37bddb86da
--- /dev/null
+++ b/libmpdemux/demux_ts.h
@@ -0,0 +1,24 @@
+/*
+ * 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_DEMUX_TS_H
+#define MPLAYER_DEMUX_TS_H
+
+#define TS_MAX_PROBE_SIZE 2000000
+
+#endif /* MPLAYER_DEMUX_TS_H */