From c6610a216ed2948885772154a2eed696e0cb4aca Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Tue, 25 Jan 2011 22:03:28 +0000 Subject: Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. --- libavdevice/alldevices.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavdevice/alldevices.c') diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index de3bc82396..ce06bf269c 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -23,11 +23,11 @@ #include "avdevice.h" #define REGISTER_OUTDEV(X,x) { \ - extern AVOutputFormat x##_muxer; \ - if(CONFIG_##X##_OUTDEV) av_register_output_format(&x##_muxer); } + extern AVOutputFormat ff_##x##_muxer; \ + if(CONFIG_##X##_OUTDEV) av_register_output_format(&ff_##x##_muxer); } #define REGISTER_INDEV(X,x) { \ - extern AVInputFormat x##_demuxer; \ - if(CONFIG_##X##_INDEV) av_register_input_format(&x##_demuxer); } + extern AVInputFormat ff_##x##_demuxer; \ + if(CONFIG_##X##_INDEV) av_register_input_format(&ff_##x##_demuxer); } #define REGISTER_INOUTDEV(X,x) REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x) void avdevice_register_all(void) -- cgit v1.2.3