summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2014-04-19 00:40:17 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2014-04-19 00:40:17 +0300
commit014a0625293c77ce91309d1cefb8501a3be4d480 (patch)
tree64e55c1d7fafae6df724b07ad16ce4d7be12e79f /src
parenteb06e427fc806ec15a9ab302b0194d608f3c6316 (diff)
downloadxine-lib-014a0625293c77ce91309d1cefb8501a3be4d480.tar.gz
xine-lib-014a0625293c77ce91309d1cefb8501a3be4d480.tar.bz2
added const
Diffstat (limited to 'src')
-rw-r--r--src/combined/ffmpeg/demux_avformat.c4
-rw-r--r--src/combined/ffmpeg/ff_audio_decoder.c2
-rw-r--r--src/combined/ffmpeg/ff_video_decoder.c6
-rw-r--r--src/combined/ffmpeg/ffmpeg_decoder.h14
-rw-r--r--src/combined/ffmpeg/input_avio.c2
-rwxr-xr-xsrc/combined/ffmpeg/mkcodeclist.pl2
6 files changed, 15 insertions, 15 deletions
diff --git a/src/combined/ffmpeg/demux_avformat.c b/src/combined/ffmpeg/demux_avformat.c
index 5e717b375..e29d10879 100644
--- a/src/combined/ffmpeg/demux_avformat.c
+++ b/src/combined/ffmpeg/demux_avformat.c
@@ -231,7 +231,7 @@ void *init_avformat_input_plugin (xine_t *xine, void *data) {
return this;
}
-input_info_t input_info_avformat = {
+const input_info_t input_info_avformat = {
-2 /* priority */
};
@@ -835,6 +835,6 @@ void *init_avformat_demux_plugin (xine_t *xine, void *data) {
return this;
}
-demuxer_info_t demux_info_avformat = {
+const demuxer_info_t demux_info_avformat = {
-1 /* priority */
};
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index f190b3a31..12a13a7db 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -1188,7 +1188,7 @@ void *init_audio_plugin (xine_t *xine, void *data) {
return this;
}
-decoder_info_t dec_info_ffmpeg_audio = {
+const decoder_info_t dec_info_ffmpeg_audio = {
supported_audio_types, /* supported types */
7 /* priority */
};
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 7e9d375db..57d3a2b93 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -2619,17 +2619,17 @@ static const uint32_t wmv9_video_types[] = {
0
};
-decoder_info_t dec_info_ffmpeg_video = {
+const decoder_info_t dec_info_ffmpeg_video = {
supported_video_types, /* supported types */
6 /* priority */
};
-decoder_info_t dec_info_ffmpeg_wmv8 = {
+const decoder_info_t dec_info_ffmpeg_wmv8 = {
wmv8_video_types, /* supported types */
0 /* priority */
};
-decoder_info_t dec_info_ffmpeg_wmv9 = {
+const decoder_info_t dec_info_ffmpeg_wmv9 = {
wmv9_video_types, /* supported types */
0 /* priority */
};
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
index a1e01adaf..d65c582c5 100644
--- a/src/combined/ffmpeg/ffmpeg_decoder.h
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h
@@ -48,13 +48,13 @@ void *init_avio_input_plugin (xine_t *xine, void *data);
void *init_avformat_input_plugin (xine_t *xine, void *data);
void *init_avformat_demux_plugin (xine_t *xine, void *data);
-extern decoder_info_t dec_info_ffmpeg_video;
-extern decoder_info_t dec_info_ffmpeg_wmv8;
-extern decoder_info_t dec_info_ffmpeg_wmv9;
-extern decoder_info_t dec_info_ffmpeg_audio;
-extern demuxer_info_t demux_info_avformat;
-extern input_info_t input_info_avformat;
-extern input_info_t input_info_avio;
+extern const decoder_info_t dec_info_ffmpeg_video;
+extern const decoder_info_t dec_info_ffmpeg_wmv8;
+extern const decoder_info_t dec_info_ffmpeg_wmv9;
+extern const decoder_info_t dec_info_ffmpeg_audio;
+extern const demuxer_info_t demux_info_avformat;
+extern const input_info_t input_info_avformat;
+extern const input_info_t input_info_avio;
/* communication between avio/avformat input and avformat demux plugins */
#define INPUT_OPTIONAL_DATA_pb 0x1000
diff --git a/src/combined/ffmpeg/input_avio.c b/src/combined/ffmpeg/input_avio.c
index 47e448f85..d1875b0f1 100644
--- a/src/combined/ffmpeg/input_avio.c
+++ b/src/combined/ffmpeg/input_avio.c
@@ -359,6 +359,6 @@ void *init_avio_input_plugin (xine_t *xine, void *data) {
return this;
}
-input_info_t input_info_avio = {
+const input_info_t input_info_avio = {
-1 /* priority */
};
diff --git a/src/combined/ffmpeg/mkcodeclist.pl b/src/combined/ffmpeg/mkcodeclist.pl
index 3f640bcfc..330946f85 100755
--- a/src/combined/ffmpeg/mkcodeclist.pl
+++ b/src/combined/ffmpeg/mkcodeclist.pl
@@ -74,7 +74,7 @@ if ($w) {
next unless defined $codecs{$line->[1]};
print LIST " { BUF_${Type}_$line->[0], $ff_prefix$line->[1], \"$line->[2] (ffmpeg)\" },\n" or die $!;
}
- print LIST "};\n\nstatic uint32_t supported_${type}_types[] = {\n" or die $!;
+ print LIST "};\n\nstatic const uint32_t supported_${type}_types[] = {\n" or die $!;
foreach $line (@known) {
next if $line->[0] eq '!';
next unless defined $codecs{$line->[1]};