From cd3d3369e15eb664385081b767c879fd069f05cc Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 2 Dec 2007 13:22:53 +0000
Subject: Mark all stream_info_t as const

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25239 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/asf_streaming.c     |  2 +-
 stream/http.c              |  4 ++--
 stream/pnm.c               |  2 +-
 stream/stream.c            | 52 +++++++++++++++++++++++-----------------------
 stream/stream_cdda.c       |  2 +-
 stream/stream_cue.c        |  2 +-
 stream/stream_dvb.c        |  2 +-
 stream/stream_dvd.c        |  4 ++--
 stream/stream_dvdnav.c     |  2 +-
 stream/stream_file.c       |  2 +-
 stream/stream_ftp.c        |  2 +-
 stream/stream_livedotcom.c |  4 ++--
 stream/stream_mf.c         |  2 +-
 stream/stream_nemesi.c     |  2 +-
 stream/stream_netstream.c  |  2 +-
 stream/stream_null.c       |  2 +-
 stream/stream_pvr.c        |  2 +-
 stream/stream_radio.c      |  2 +-
 stream/stream_rtp.c        |  2 +-
 stream/stream_rtsp.c       |  2 +-
 stream/stream_smb.c        |  2 +-
 stream/stream_tv.c         |  2 +-
 stream/stream_udp.c        |  2 +-
 stream/stream_vcd.c        |  2 +-
 stream/stream_vstream.c    |  2 +-
 25 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c
index d022f70443..40ec466b55 100644
--- a/stream/asf_streaming.c
+++ b/stream/asf_streaming.c
@@ -870,7 +870,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
 	return STREAM_OK;
 }
 
-stream_info_t stream_info_asf = {
+const stream_info_t stream_info_asf = {
   "mms and mms over http streaming",
   "null",
   "Bertrand, Reimar Doeffinger, Albeu",
diff --git a/stream/http.c b/stream/http.c
index 506faa67a4..abf92e7227 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -954,7 +954,7 @@ static int open_s2(stream_t *stream,int mode, void* opts, int* file_format) {
 }
 
 
-stream_info_t stream_info_http1 = {
+const stream_info_t stream_info_http1 = {
   "http streaming",
   "null",
   "Bertrand, Albeau, Reimar Doeffinger, Arpi?",
@@ -965,7 +965,7 @@ stream_info_t stream_info_http1 = {
   0 // Urls are an option string
 };
 
-stream_info_t stream_info_http2 = {
+const stream_info_t stream_info_http2 = {
   "http streaming",
   "null",
   "Bertrand, Albeu, Arpi? who?",
diff --git a/stream/pnm.c b/stream/pnm.c
index 615ed77d79..068a7e8c01 100644
--- a/stream/pnm.c
+++ b/stream/pnm.c
@@ -897,7 +897,7 @@ fail:
 }
 
 
-stream_info_t stream_info_pnm = {
+const stream_info_t stream_info_pnm = {
   "RealNetworks pnm",
   "pnm",
   "Arpi, xine team",
diff --git a/stream/stream.c b/stream/stream.c
index 26725bbbb9..4555a62381 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -36,57 +36,57 @@
 //#include "vcd_read_bincue.h"
 
 #ifdef HAVE_VCD
-extern stream_info_t stream_info_vcd;
+extern const stream_info_t stream_info_vcd;
 #endif
 #ifdef HAVE_CDDA
-extern stream_info_t stream_info_cdda;
+extern const stream_info_t stream_info_cdda;
 #endif
 #ifdef MPLAYER_NETWORK
-extern stream_info_t stream_info_netstream;
-extern stream_info_t stream_info_pnm;
-extern stream_info_t stream_info_asf;
-extern stream_info_t stream_info_rtsp;
-extern stream_info_t stream_info_rtp;
-extern stream_info_t stream_info_udp;
-extern stream_info_t stream_info_http1;
-extern stream_info_t stream_info_http2;
+extern const stream_info_t stream_info_netstream;
+extern const stream_info_t stream_info_pnm;
+extern const stream_info_t stream_info_asf;
+extern const stream_info_t stream_info_rtsp;
+extern const stream_info_t stream_info_rtp;
+extern const stream_info_t stream_info_udp;
+extern const stream_info_t stream_info_http1;
+extern const stream_info_t stream_info_http2;
 #endif
 #ifdef HAS_DVBIN_SUPPORT
-extern stream_info_t stream_info_dvb;
+extern const stream_info_t stream_info_dvb;
 #endif
 #ifdef USE_TV
-extern stream_info_t stream_info_tv;
+extern const stream_info_t stream_info_tv;
 #endif
 #ifdef USE_RADIO
-extern stream_info_t stream_info_radio;
+extern const stream_info_t stream_info_radio;
 #endif
 #ifdef HAVE_PVR
-extern stream_info_t stream_info_pvr;
+extern const stream_info_t stream_info_pvr;
 #endif
 #ifdef HAVE_FTP
-extern stream_info_t stream_info_ftp;
+extern const stream_info_t stream_info_ftp;
 #endif
 #ifdef HAVE_VSTREAM
-extern stream_info_t stream_info_vstream;
+extern const stream_info_t stream_info_vstream;
 #endif
 #ifdef USE_DVDNAV
-extern stream_info_t stream_info_dvdnav;
+extern const stream_info_t stream_info_dvdnav;
 #endif
 #ifdef LIBSMBCLIENT
-extern stream_info_t stream_info_smb;
+extern const stream_info_t stream_info_smb;
 #endif
 #ifdef STREAMING_LIVE555
-extern stream_info_t stream_info_sdp;
-extern stream_info_t stream_info_rtsp_sip;
+extern const stream_info_t stream_info_sdp;
+extern const stream_info_t stream_info_rtsp_sip;
 #endif
 
-extern stream_info_t stream_info_cue;
-extern stream_info_t stream_info_null;
-extern stream_info_t stream_info_mf;
-extern stream_info_t stream_info_file;
+extern const stream_info_t stream_info_cue;
+extern const stream_info_t stream_info_null;
+extern const stream_info_t stream_info_mf;
+extern const stream_info_t stream_info_file;
 #ifdef USE_DVDREAD
-extern stream_info_t stream_info_ifo;
-extern stream_info_t stream_info_dvd;
+extern const stream_info_t stream_info_ifo;
+extern const stream_info_t stream_info_dvd;
 #endif
 
 static const stream_info_t* const auto_open_streams[] = {
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 2ac310ab05..75f51121f1 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -382,7 +382,7 @@ static void close_cdda(stream_t* s) {
   free(p);
 }
 
-stream_info_t stream_info_cdda = {
+const stream_info_t stream_info_cdda = {
   "CDDA",
   "cdda",
   "Albeu",
diff --git a/stream/stream_cue.c b/stream/stream_cue.c
index 477bc07d98..c42f47d0fb 100644
--- a/stream/stream_cue.c
+++ b/stream/stream_cue.c
@@ -591,7 +591,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
   return STREAM_OK;
 }
 
-stream_info_t stream_info_cue = {
+const stream_info_t stream_info_cue = {
   "CUE track",
   "cue",
   "Albeu",
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index ec333bf975..d31d6a5d69 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -840,7 +840,7 @@ dvb_config_t *dvb_get_config(void)
 
 
 
-stream_info_t stream_info_dvb = {
+const stream_info_t stream_info_dvb = {
 	"Dvb Input",
 	"dvbin",
 	"Nico",
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index c7f5109cfc..11eab33d4c 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -1110,7 +1110,7 @@ ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
     return open_s(stream, mode, dvd_priv, file_format);
 }
 
-stream_info_t stream_info_dvd = {
+const stream_info_t stream_info_dvd = {
   "DVD stream",
   "null",
   "",
@@ -1121,7 +1121,7 @@ stream_info_t stream_info_dvd = {
   1 // Urls are an option string
 };
 
-stream_info_t stream_info_ifo = {
+const stream_info_t stream_info_ifo = {
   "DVD IFO input",
   "ifo",
   "Benjamin Zores",
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index c4e8c5af5d..3300354211 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -725,7 +725,7 @@ void mp_dvdnav_get_highlight (stream_t *stream, nav_highlight_t *hl) {
   hl->ey = hlev.ey;
 }
 
-stream_info_t stream_info_dvdnav = {
+const stream_info_t stream_info_dvdnav = {
   "DVDNAV stream",
   "null",
   "",
diff --git a/stream/stream_file.c b/stream/stream_file.c
index cc95a7491b..c9351d09d1 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -175,7 +175,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
   return STREAM_OK;
 }
 
-stream_info_t stream_info_file = {
+const stream_info_t stream_info_file = {
   "File",
   "file",
   "Albeu",
diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c
index 9ad3bb218d..1aefa57d21 100644
--- a/stream/stream_ftp.c
+++ b/stream/stream_ftp.c
@@ -458,7 +458,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
   return STREAM_OK;
 }
 
-stream_info_t stream_info_ftp = {
+const stream_info_t stream_info_ftp = {
   "File Transfer Protocol",
   "ftp",
   "Albeu",
diff --git a/stream/stream_livedotcom.c b/stream/stream_livedotcom.c
index 84f869be27..13b5022883 100644
--- a/stream/stream_livedotcom.c
+++ b/stream/stream_livedotcom.c
@@ -96,7 +96,7 @@ static int open_live_sdp(stream_t *stream,int mode, void* opts, int* file_format
 }
 
 
-stream_info_t stream_info_rtsp_sip = {
+const stream_info_t stream_info_rtsp_sip = {
   "standard RTSP and SIP",
   "RTSP and SIP",
   "Ross Finlayson",
@@ -107,7 +107,7 @@ stream_info_t stream_info_rtsp_sip = {
   0 // Urls are an option string
 };
 
-stream_info_t stream_info_sdp = {
+const stream_info_t stream_info_sdp = {
   "SDP stream descriptor",
   "SDP",
   "Ross Finlayson",
diff --git a/stream/stream_mf.c b/stream/stream_mf.c
index 89a734d2f9..91d9f9aa8f 100644
--- a/stream/stream_mf.c
+++ b/stream/stream_mf.c
@@ -34,7 +34,7 @@ mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
   return STREAM_OK;
 }
 
-stream_info_t stream_info_mf = {
+const stream_info_t stream_info_mf = {
   "Multiple files input",
   "mf",
   "Benjamin Zores, Albeu",
diff --git a/stream/stream_nemesi.c b/stream/stream_nemesi.c
index a3f98a6a09..e008035be5 100644
--- a/stream/stream_nemesi.c
+++ b/stream/stream_nemesi.c
@@ -64,7 +64,7 @@ static int rtsp_streaming_open (stream_t *stream, int mode, void *opts,
     return STREAM_OK;
 }
 
-stream_info_t stream_info_rtsp = {
+const stream_info_t stream_info_rtsp = {
   "RTSP streaming",
   "rtsp",
   "Alessandro Molina",
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index edadc565b6..8070abe5d4 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -296,7 +296,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
   return STREAM_ERROR;
 }
 
-stream_info_t stream_info_netstream = {
+const stream_info_t stream_info_netstream = {
   "Net stream",
   "netstream",
   "Albeu",
diff --git a/stream/stream_null.c b/stream/stream_null.c
index 70221482d4..7bbef09c60 100644
--- a/stream/stream_null.c
+++ b/stream/stream_null.c
@@ -13,7 +13,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
 }
 
 
-stream_info_t stream_info_null = {
+const stream_info_t stream_info_null = {
   "Null stream",
   "null",
   "Albeu",
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index f94d77fa73..eeedbc1b75 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -1766,7 +1766,7 @@ pvr_force_freq_step (stream_t *stream, int step)
   return force_freq_step (pvr, step);
 }
 
-stream_info_t stream_info_pvr = {
+const stream_info_t stream_info_pvr = {
   "V4L2 MPEG Input (a.k.a PVR)",
   "pvr",
   "Benjamin Zores",
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index a29407d5e1..3aae1aaf59 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -1252,7 +1252,7 @@ static void close_s(struct stream_st * stream){
     stream->priv=NULL;
 }
 
-stream_info_t stream_info_radio = {
+const stream_info_t stream_info_radio = {
     "Radio stream",
     "Radio",
     "Vladimir Voroshilov",
diff --git a/stream/stream_rtp.c b/stream/stream_rtp.c
index d96ed19401..173c0f662f 100644
--- a/stream/stream_rtp.c
+++ b/stream/stream_rtp.c
@@ -103,7 +103,7 @@ rtp_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
   return STREAM_OK;
 }
 
-stream_info_t stream_info_rtp = {
+const stream_info_t stream_info_rtp = {
   "MPEG over RTP streaming",
   "rtp",
   "Dave Chapman, Benjamin Zores",
diff --git a/stream/stream_rtsp.c b/stream/stream_rtsp.c
index a6edebb825..58fda7aa3f 100644
--- a/stream/stream_rtsp.c
+++ b/stream/stream_rtsp.c
@@ -167,7 +167,7 @@ rtsp_streaming_open (stream_t *stream, int mode, void *opts, int *file_format)
   return STREAM_OK;
 }
 
-stream_info_t stream_info_rtsp = {
+const stream_info_t stream_info_rtsp = {
   "RTSP streaming",
   "rtsp",
   "Benjamin Zores, Roberto Togni",
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index e4b05c054e..a1238dac71 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -153,7 +153,7 @@ static int open_f (stream_t *stream, int mode, void *opts, int* file_format) {
   return STREAM_OK;
 }
 
-stream_info_t stream_info_smb = {
+const stream_info_t stream_info_smb = {
   "Server Message Block",
   "smb",
   "M. Tourne",
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index c0f2aaa2df..19f991683d 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -113,7 +113,7 @@ tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
   return STREAM_OK;
 }
 
-stream_info_t stream_info_tv = {
+const stream_info_t stream_info_tv = {
   "TV Input",
   "tv",
   "Benjamin Zores, Albeu",
diff --git a/stream/stream_udp.c b/stream/stream_udp.c
index 27028f3184..c448d88a97 100644
--- a/stream/stream_udp.c
+++ b/stream/stream_udp.c
@@ -95,7 +95,7 @@ udp_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
   return STREAM_OK;
 }
 
-stream_info_t stream_info_udp = {
+const stream_info_t stream_info_udp = {
   "MPEG over UDP streaming",
   "udp",
   "Dave Chapman, Benjamin Zores",
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 7417993f81..9af9c12719 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -176,7 +176,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
   return STREAM_OK;
 }
 
-stream_info_t stream_info_vcd = {
+const stream_info_t stream_info_vcd = {
   "Video CD",
   "vcd",
   "Albeu",
diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c
index d2bc7c5198..9e067524c7 100644
--- a/stream/stream_vstream.c
+++ b/stream/stream_vstream.c
@@ -167,7 +167,7 @@ static int open_s(stream_t *stream, int mode, void* opts, int* file_format) {
   return STREAM_OK;
 }
 
-stream_info_t stream_info_vstream = {
+const stream_info_t stream_info_vstream = {
   "vstream client",
   "vstream",
   "Joey",
-- 
cgit v1.2.3