diff options
| -rw-r--r-- | cfg-common-opts.h | 1 | ||||
| -rw-r--r-- | cfg-mencoder.h | 1 | ||||
| -rw-r--r-- | cfg-mplayer.h | 1 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.c | 1 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.h | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index b701ba26e5..bd78ab38b4 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -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 --git a/cfg-mencoder.h b/cfg-mencoder.h index 993e1696bd..b9845b30ae 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -24,6 +24,7 @@ */ #include "libmpcodecs/ve_x264.h" +#include "libmpdemux/demux_ts.h" #include "cfg-common.h" extern int sws_flags; diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 1cb5b5ff59..85b65bc135 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -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 --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 0a79dcded5..eb80ab1701 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -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 --git a/libmpdemux/demux_ts.h b/libmpdemux/demux_ts.h index e8db01716f..7a06d80f2e 100644 --- a/libmpdemux/demux_ts.h +++ b/libmpdemux/demux_ts.h @@ -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 */ |