Skip to content
Snippets Groups Projects
Commit d999cff5 authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

remove last dependencies on allformats.h and allcodecs.h

Originally committed as revision 10535 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a889bf13
No related branches found
No related tags found
No related merge requests found
...@@ -24,18 +24,22 @@ ...@@ -24,18 +24,22 @@
* Provides registration of all codecs, parsers and bitstream filters for libavcodec. * Provides registration of all codecs, parsers and bitstream filters for libavcodec.
*/ */
#include "allcodecs.h" #include "avcodec.h"
#define REGISTER_ENCODER(X,x) \ #define REGISTER_ENCODER(X,x) { \
if(ENABLE_##X##_ENCODER) register_avcodec(&x##_encoder) extern AVCodec x##_encoder; \
#define REGISTER_DECODER(X,x) \ if(ENABLE_##X##_ENCODER) register_avcodec(&x##_encoder); }
if(ENABLE_##X##_DECODER) register_avcodec(&x##_decoder) #define REGISTER_DECODER(X,x) { \
extern AVCodec x##_decoder; \
if(ENABLE_##X##_DECODER) register_avcodec(&x##_decoder); }
#define REGISTER_ENCDEC(X,x) REGISTER_ENCODER(X,x); REGISTER_DECODER(X,x) #define REGISTER_ENCDEC(X,x) REGISTER_ENCODER(X,x); REGISTER_DECODER(X,x)
#define REGISTER_PARSER(X,x) \ #define REGISTER_PARSER(X,x) { \
if(ENABLE_##X##_PARSER) av_register_codec_parser(&x##_parser) extern AVCodecParser x##_parser; \
#define REGISTER_BSF(X,x) \ if(ENABLE_##X##_PARSER) av_register_codec_parser(&x##_parser); }
if(ENABLE_##X##_BSF) av_register_bitstream_filter(&x##_bsf) #define REGISTER_BSF(X,x) { \
extern AVBitStreamFilter x##_bsf; \
if(ENABLE_##X##_BSF) av_register_bitstream_filter(&x##_bsf); }
/** /**
* Register all the codecs, parsers and bitstream filters which were enabled at * Register all the codecs, parsers and bitstream filters which were enabled at
......
...@@ -19,16 +19,21 @@ ...@@ -19,16 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "avformat.h" #include "avformat.h"
#include "allformats.h"
#include "rtp_internal.h" #include "rtp_internal.h"
#define REGISTER_MUXER(X,x) \ /* rtp.c */
if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer) void av_register_rtp_dynamic_payload_handlers(void);
#define REGISTER_DEMUXER(X,x) \
if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer) #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_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
#define REGISTER_PROTOCOL(X,x) \ #define REGISTER_PROTOCOL(X,x) { \
if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol) 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 /* If you do not call this function, then you can select exactly which
formats you want to support */ formats you want to support */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment