[MPlayer-cvslog] r30621 - in trunk/libmpdemux: demux_ts.c mpeg_hdr.h

[diego]

Author: diego
Date: Wed Feb 17 23:58:03 2010
New Revision: 30621

Log:
Add mp_getbits() to mpeg_hdr.h to avoid a forward declaration.

Modified:
   trunk/libmpdemux/demux_ts.c
   trunk/libmpdemux/mpeg_hdr.h

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Wed Feb 17 23:52:31 2010	(r30620)
+++ trunk/libmpdemux/demux_ts.c	Wed Feb 17 23:58:03 2010	(r30621)
@@ -1115,7 +1115,6 @@ static void demux_close_ts(demuxer_t * d
 }
 
 
-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)

Modified: trunk/libmpdemux/mpeg_hdr.h
==============================================================================
--- trunk/libmpdemux/mpeg_hdr.h	Wed Feb 17 23:52:31 2010	(r30620)
+++ trunk/libmpdemux/mpeg_hdr.h	Wed Feb 17 23:58:03 2010	(r30621)
@@ -48,4 +48,6 @@ void mp4_header_process_vop(mp_mpeg_head
 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 */