From 8d5912e60d3e2a12f9dae475af4472c2bc6490a6 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
Date: Tue, 12 Aug 2008 14:17:00 +0300
Subject: [PATCH] mpeg ao/vo drivers: Fix packet-writing helper function types

Add missing 'const' to callback functions passed to
send_mpeg_pes_packet() / send_mpeg_lpcm_packet().
---
 libao2/ao_ivtv.c    | 2 +-
 libao2/ao_mpegpes.c | 2 +-
 libao2/ao_v4l2.c    | 2 +-
 libvo/vo_ivtv.c     | 2 +-
 libvo/vo_mpegpes.c  | 2 +-
 libvo/vo_v4l2.c     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libao2/ao_ivtv.c b/libao2/ao_ivtv.c
index 4d1d578ba0..0c7ec22384 100644
--- a/libao2/ao_ivtv.c
+++ b/libao2/ao_ivtv.c
@@ -147,7 +147,7 @@ get_space (void)
 static int
 play (void *data, int len, int flags)
 {
-  extern int ivtv_write (unsigned char *data, int len);
+  extern int ivtv_write (const unsigned char *data, int len);
   
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index fd6ec4da4a..c6c66cd5ff 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -188,7 +188,7 @@ static int preinit(const char *arg)
 	return vo_mpegpes_fd2;
 }
 
-static int my_ao_write(unsigned char* data,int len){
+static int my_ao_write(const unsigned char* data,int len){
     int orig_len = len;
 #ifdef HAVE_DVB
 #define NFD   1
diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c
index dc63003b06..4f57d81944 100644
--- a/libao2/ao_v4l2.c
+++ b/libao2/ao_v4l2.c
@@ -144,7 +144,7 @@ get_space (void)
 static int
 play (void *data, int len, int flags)
 {
-  extern int v4l2_write (unsigned char *data, int len);
+  extern int v4l2_write (const unsigned char *data, int len);
   
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
diff --git a/libvo/vo_ivtv.c b/libvo/vo_ivtv.c
index 7faf8a1415..38b9ee7f4e 100644
--- a/libvo/vo_ivtv.c
+++ b/libvo/vo_ivtv.c
@@ -108,7 +108,7 @@ ivtv_reset (int blank_screen)
 }
 
 int
-ivtv_write (unsigned char *data, int len)
+ivtv_write (const unsigned char *data, int len)
 {
   if (ivtv_fd < 0)
     return 0;
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index a113fa32f2..ec67bceee5 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -172,7 +172,7 @@ static void draw_osd(void)
 }
 
 
-static int my_write(unsigned char* data,int len){
+static int my_write(const unsigned char* data,int len){
     int orig_len = len;
 #ifdef HAVE_DVB
 #define NFD   2
diff --git a/libvo/vo_v4l2.c b/libvo/vo_v4l2.c
index fb4a666593..7157c68430 100644
--- a/libvo/vo_v4l2.c
+++ b/libvo/vo_v4l2.c
@@ -69,7 +69,7 @@ static const vo_info_t info =
 const LIBVO_EXTERN (v4l2)
 
 int
-v4l2_write (unsigned char *data, int len)
+v4l2_write (const unsigned char *data, int len)
 {
   if (v4l2_fd < 0)
     return 0;