diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-10-07 09:31:16 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-10-07 09:31:16 +0000 |
| commit | b4f854c14c09e5dfeca6dc775509df647d2f1225 (patch) | |
| tree | 6a008c17e79944eea14fe710c2a538b4d5f87e9d /libmpdemux/demux_ts.c | |
| parent | 8dd84ac2bb0a4e68d71605c7c683866acc4b032b (diff) | |
| download | mpv-b4f854c14c09e5dfeca6dc775509df647d2f1225.tar.bz2 mpv-b4f854c14c09e5dfeca6dc775509df647d2f1225.tar.xz | |
fixing --disable for mp3lib, liba52 and libmpeg2, patch by (basic (at) mozdev (dot) org), see also bug #102
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13580 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
| -rw-r--r-- | libmpdemux/demux_ts.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index b13bb89747..3843e6aeae 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -374,6 +374,7 @@ typedef struct { } tsdemux_init_t; +#ifdef USE_LIBA52 //second stage: returns the count of A52 syncwords found static int a52_check(char *buf, int len) { @@ -401,6 +402,7 @@ static int a52_check(char *buf, int len) mp_msg(MSGT_DEMUXER, MSGL_V, "A52_CHECK(%d input bytes), found %d frame syncwords of %d bytes length\n", len, ok, frame_length); return ok; } +#endif static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) @@ -432,6 +434,7 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) pos = stream_tell(demuxer->stream); if(ts_parse(demuxer, &es, tmp, 1)) { +#ifdef USE_LIBA52 //Non PES-aligned A52 audio may escape detection if PMT is not present; //in this case we try to find at least 3 A52 syncwords if((es.type == PES_PRIVATE1) && (! audio_found)) @@ -449,6 +452,7 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) } } } +#endif is_audio = ((es.type == AUDIO_MP2) || (es.type == AUDIO_A52) || (es.type == AUDIO_LPCM_BE) || (es.type == AUDIO_AAC)); is_video = ((es.type == VIDEO_MPEG1) || (es.type == VIDEO_MPEG2) || (es.type == VIDEO_MPEG4)); |