diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
| commit | 497c32cdadb9da9bc20a3650b3056e2657358136 (patch) | |
| tree | ed3d48e5f9631d2951d8569b48a00d025c20ab08 /libmpdemux | |
| parent | 626373af3840220d40217b7bbe81f5fb452882bb (diff) | |
| parent | def243261a0b8e3ab0d043cd89b97f8c9826e573 (diff) | |
| download | mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.bz2 mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.xz | |
Merge svn changes up to r31291
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ts.c | 1 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index adef44913c..697c7e7b9b 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 */ |