[MPlayer-cvslog] r31291 - in trunk: cfg-common-opts.h cfg-mencoder.h cfg-mplayer.h libmpdemux/demux_ts.c libmpdemux/demux_ts.h

[diego]

Author: diego
Date: Mon May 31 00:14:13 2010
New Revision: 31291

Log:
Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.

Modified:
   trunk/cfg-common-opts.h
   trunk/cfg-mencoder.h
   trunk/cfg-mplayer.h
   trunk/libmpdemux/demux_ts.c
   trunk/libmpdemux/demux_ts.h

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	Mon May 31 00:11:32 2010	(r31290)
+++ trunk/cfg-common-opts.h	Mon May 31 00:14:13 2010	(r31291)
@@ -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},

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Mon May 31 00:11:32 2010	(r31290)
+++ trunk/cfg-mencoder.h	Mon May 31 00:14:13 2010	(r31291)
@@ -24,6 +24,7 @@
  */
 
 #include "libmpcodecs/ve_x264.h"
+#include "libmpdemux/demux_ts.h"
 #include "cfg-common.h"
 
 extern int sws_flags;

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Mon May 31 00:11:32 2010	(r31290)
+++ trunk/cfg-mplayer.h	Mon May 31 00:14:13 2010	(r31291)
@@ -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;

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Mon May 31 00:11:32 2010	(r31290)
+++ trunk/libmpdemux/demux_ts.c	Mon May 31 00:14:13 2010	(r31291)
@@ -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

Modified: trunk/libmpdemux/demux_ts.h
==============================================================================
--- trunk/libmpdemux/demux_ts.h	Mon May 31 00:11:32 2010	(r31290)
+++ trunk/libmpdemux/demux_ts.h	Mon May 31 00:14:13 2010	(r31291)
@@ -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 */