summaryrefslogtreecommitdiffstats
path: root/sub_cc.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-27 10:07:19 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-16 04:57:18 +0200
commite23bf53fadb0ba3af28a3ac140291fa47975c73d (patch)
treeceee1cfa69b85ce104043ef2cd1296ff18c08626 /sub_cc.c
parentbb4cca9b325e96c9c7f05e9a902998564e41ea13 (diff)
downloadmpv-e23bf53fadb0ba3af28a3ac140291fa47975c73d.tar.bz2
mpv-e23bf53fadb0ba3af28a3ac140291fa47975c73d.tar.xz
cosmetics: make some arguments const, "unsigned char"->uint8_t
Mark input-only buffers as const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32652 b3059339-0415-0410-9bf9-f77b7e298cf2 Use uint8_t type instead of unsigned char. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32653 b3059339-0415-0410-9bf9-f77b7e298cf2 Mark input buffer that is never modified as const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32654 b3059339-0415-0410-9bf9-f77b7e298cf2 Mark input-only buffer as const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32655 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'sub_cc.c')
-rw-r--r--sub_cc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sub_cc.c b/sub_cc.c
index c64c2850a6..2422518355 100644
--- a/sub_cc.c
+++ b/sub_cc.c
@@ -182,8 +182,8 @@ static void cc_decode_EIA608(unsigned short int data)
{
static unsigned short int lastcode=0x0000;
- unsigned char c1 = data & 0x7f;
- unsigned char c2 = (data >> 8) & 0x7f;
+ uint8_t c1 = data & 0x7f;
+ uint8_t c2 = (data >> 8) & 0x7f;
if (c1 & 0x60) { /* normal character, 0x20 <= c1 <= 0x7f */
if (channel != (selected_channel() & 1))
@@ -254,7 +254,7 @@ static void cc_decode_EIA608(unsigned short int data)
lastcode=data;
}
-static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength)
+static void subcc_decode(const uint8_t *inputbuffer, unsigned int inputlength)
{
/* The first number may denote a channel number. I don't have the
* EIA-708 standard, so it is hard to say.
@@ -287,10 +287,10 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength)
*
* until end of packet
*/
- unsigned char *current = inputbuffer;
+ const uint8_t *current = inputbuffer;
unsigned int curbytes = 0;
- unsigned char data1, data2;
- unsigned char cc_code;
+ uint8_t data1, data2;
+ uint8_t cc_code;
int odd_offset = 1;
while (curbytes < inputlength) {
@@ -338,7 +338,7 @@ static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength)
}
-void subcc_process_data(unsigned char *inputdata,unsigned int len)
+void subcc_process_data(const uint8_t *inputdata, unsigned int len)
{
if(!subcc_enabled) return;
if(!initialized) subcc_init();