diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-09-20 20:36:15 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-09-20 20:36:15 +0000 |
| commit | d999cff5a3ae29833d65f640c64ded470cf0c6f0 (patch) | |
| tree | b75d8f6fa1e9605c6c57798b2b73fc56e8763f80 /libavformat | |
| parent | a889bf135eb902eaa0acb20cc6ce4be7d31d81f6 (diff) | |
remove last dependencies on allformats.h and allcodecs.h
Originally committed as revision 10535 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/allformats.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1b7af2aca2..6ed3eb83d4 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -19,16 +19,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" -#include "allformats.h" #include "rtp_internal.h" -#define REGISTER_MUXER(X,x) \ - if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer) -#define REGISTER_DEMUXER(X,x) \ - if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer) +/* rtp.c */ +void av_register_rtp_dynamic_payload_handlers(void); + +#define REGISTER_MUXER(X,x) { \ + extern AVOutputFormat x##_muxer; \ + if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer); } +#define REGISTER_DEMUXER(X,x) { \ + extern AVInputFormat x##_demuxer; \ + if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } #define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x) -#define REGISTER_PROTOCOL(X,x) \ - if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol) +#define REGISTER_PROTOCOL(X,x) { \ + extern URLProtocol x##_protocol; \ + if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol); } /* If you do not call this function, then you can select exactly which formats you want to support */ |