diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_ts.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ts.h | 26 | ||||
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 3 |
3 files changed, 28 insertions, 3 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 6b56b55ffc..7ee6d5ea1c 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -34,9 +34,9 @@ #include "demuxer.h" #include "parse_es.h" #include "stheader.h" - #include "ms_hdr.h" #include "mpeg_hdr.h" +#include "demux_ts.h" #define TS_PH_PACKET_SIZE 192 #define TS_FEC_PACKET_SIZE 204 diff --git a/libmpdemux/demux_ts.h b/libmpdemux/demux_ts.h new file mode 100644 index 0000000000..e8db01716f --- /dev/null +++ b/libmpdemux/demux_ts.h @@ -0,0 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_DEMUX_TS_H +#define MPLAYER_DEMUX_TS_H + +#include <stdint.h> + +int mp_a52_framesize(uint8_t *buf, int *srate); + +#endif /* MPLAYER_DEMUX_TS_H */ diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index faa5eb4bf5..fc066d1eca 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -32,6 +32,7 @@ #include "stream/stream.h" #include "muxer.h" #include "demuxer.h" +#include "demux_ts.h" #include "stheader.h" #include "m_option.h" #include "aac_hdr.h" @@ -232,8 +233,6 @@ m_option_t mpegopts_conf[] = { {NULL, NULL, 0, 0, 0, 0, NULL} }; -int mp_a52_framesize(uint8_t *buf, int *srate); - static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size) { uint8_t i; |