Mercurial > mplayer.hg

changeset 30579:7c6145c57bda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add mp_getbits() to mpeg_hdr.h to avoid a forward declaration.
author diego
date Wed, 17 Feb 2010 22:58:03 +0000
parents 1cb4281551e2
children a25d16882312
files libmpdemux/demux_ts.c libmpdemux/mpeg_hdr.h
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_ts.c	Wed Feb 17 22:52:31 2010 +0000
+++ b/libmpdemux/demux_ts.c	Wed Feb 17 22:58:03 2010 +0000
@@ -1115,7 +1115,6 @@
 }
 
 
-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)
--- a/libmpdemux/mpeg_hdr.h	Wed Feb 17 22:52:31 2010 +0000
+++ b/libmpdemux/mpeg_hdr.h	Wed Feb 17 22:58:03 2010 +0000
@@ -48,4 +48,6 @@
 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 */