# HG changeset patch
# User diego
# Date 1275257653 0
# Node ID 1a2bfa6a546baafabb85ffb732af93901aca1616
# Parent  c39e4d33a07a14977980e4c71d045d008b433c3d
Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.

diff -r c39e4d33a07a -r 1a2bfa6a546b cfg-common-opts.h
--- a/cfg-common-opts.h	Sun May 30 22:11:32 2010 +0000
+++ b/cfg-common-opts.h	Sun May 30 22:14:13 2010 +0000
@@ -264,7 +264,6 @@
     {"tsfastparse", "-tsfastparse is no longer a valid option.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
 },
     {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},
-#define TS_MAX_PROBE_SIZE 2000000 /* don't forget to change this in libmpdemux/demux_ts.c too */
     {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL},
     {"psprobe", &ps_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL},
     {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL},
diff -r c39e4d33a07a -r 1a2bfa6a546b cfg-mencoder.h
--- a/cfg-mencoder.h	Sun May 30 22:11:32 2010 +0000
+++ b/cfg-mencoder.h	Sun May 30 22:14:13 2010 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "libmpcodecs/ve_x264.h"
+#include "libmpdemux/demux_ts.h"
 #include "cfg-common.h"
 
 extern int sws_flags;
diff -r c39e4d33a07a -r 1a2bfa6a546b cfg-mplayer.h
--- a/cfg-mplayer.h	Sun May 30 22:11:32 2010 +0000
+++ b/cfg-mplayer.h	Sun May 30 22:14:13 2010 +0000
@@ -25,6 +25,7 @@
 
 #include "cfg-common.h"
 #include "libmpcodecs/vd.h"
+#include "libmpdemux/demux_ts.h"
 #include "libvo/vo_zr.h"
 
 extern int key_fifo_size;
diff -r c39e4d33a07a -r 1a2bfa6a546b libmpdemux/demux_ts.c
--- a/libmpdemux/demux_ts.c	Sun May 30 22:11:32 2010 +0000
+++ b/libmpdemux/demux_ts.c	Sun May 30 22:14:13 2010 +0000
@@ -45,7 +45,6 @@
 
 #define MAX_HEADER_SIZE 6			/* enough for PES header + length */
 #define MAX_CHECK_SIZE	65535
-#define TS_MAX_PROBE_SIZE 2000000 /* do not forget to change this in cfg-common-opts.h, too */
 #define NUM_CONSECUTIVE_TS_PACKETS 32
 #define NUM_CONSECUTIVE_AUDIO_PACKETS 348
 #define MAX_A52_FRAME_SIZE 3840
diff -r c39e4d33a07a -r 1a2bfa6a546b libmpdemux/demux_ts.h
--- a/libmpdemux/demux_ts.h	Sun May 30 22:11:32 2010 +0000
+++ b/libmpdemux/demux_ts.h	Sun May 30 22:14:13 2010 +0000
@@ -21,6 +21,8 @@
 
 #include <stdint.h>
 
+#define TS_MAX_PROBE_SIZE 2000000
+
 int mp_a52_framesize(uint8_t *buf, int *srate);
 
 #endif /* MPLAYER_DEMUX_TS_H */