diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 22:03:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-28 03:15:34 +0100 |
| commit | 66355be3c3eb8e797589058b0773f773a8c2231e (patch) | |
| tree | 8dfe2254904eafda194acc98c465bf2ece7f69a6 /libavformat/allformats.c | |
| parent | ebf3ee16c765811fe3ab0c8a295ada0e2f5eca44 (diff) | |
| download | ffmpeg-66355be3c3eb8e797589058b0773f773a8c2231e.tar.gz | |
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.
(cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 5fa97efa0b..0ff4b5aa8e 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -23,18 +23,18 @@ #include "rdt.h" #define REGISTER_MUXER(X,x) { \ - extern AVOutputFormat x##_muxer; \ - if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); } + extern AVOutputFormat ff_##x##_muxer; \ + if(CONFIG_##X##_MUXER) av_register_output_format(&ff_##x##_muxer); } #define REGISTER_DEMUXER(X,x) { \ - extern AVInputFormat x##_demuxer; \ - if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } + extern AVInputFormat ff_##x##_demuxer; \ + if(CONFIG_##X##_DEMUXER) av_register_input_format(&ff_##x##_demuxer); } #define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x) #define REGISTER_PROTOCOL(X,x) { \ - extern URLProtocol x##_protocol; \ - if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&x##_protocol, sizeof(x##_protocol)); } + extern URLProtocol ff_##x##_protocol; \ + if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); } void av_register_all(void) { |