diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:58:03 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:58:03 +0000 |
| commit | 4a9770c1c27b146bac553502cfacd11ae5ead0df (patch) | |
| tree | 008c6939c5963e21f1f6aa053a417fd60f152a1c /libmpdemux | |
| parent | 2d776c8c768349798412a6121e581a3078fff4e6 (diff) | |
| download | mpv-4a9770c1c27b146bac553502cfacd11ae5ead0df.tar.bz2 mpv-4a9770c1c27b146bac553502cfacd11ae5ead0df.tar.xz | |
Add mp_getbits() to mpeg_hdr.h to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30621 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ts.c | 1 | ||||
| -rw-r--r-- | libmpdemux/mpeg_hdr.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 7ee6d5ea1c..d27ae76596 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -1115,7 +1115,6 @@ static void demux_close_ts(demuxer_t * demuxer) } -unsigned char mp_getbits(unsigned char*, unsigned int, unsigned char); #define getbits mp_getbits static int mp4_parse_sl_packet(pmt_t *pmt, uint8_t *buf, uint16_t packet_len, int pid, ES_stream_t *pes_es) diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h index cb9aef1625..d9922767b2 100644 --- a/libmpdemux/mpeg_hdr.h +++ b/libmpdemux/mpeg_hdr.h @@ -48,4 +48,6 @@ void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer); int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len); int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len); +unsigned char mp_getbits(unsigned char *buffer, unsigned int from, unsigned char len); + #endif /* MPLAYER_MPEG_HDR_H */ |