Merge commit '69583bd3b1eba471366141c945030c163e073e02'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Dec 2012 12:05:37 +0000 (13:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Dec 2012 12:05:37 +0000 (13:05 +0100)
* commit '69583bd3b1eba471366141c945030c163e073e02':
  avfilter: Refactor unconditional filter registration
  build: Add rtpenc_chain extra config option
  configure: Add --disable-all command line option

Conflicts:
libavfilter/allfilters.c
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavfilter/allfilters.c
libavformat/Makefile

diff --cc configure
+++ b/configure
@@@ -98,9 -97,10 +98,10 @@@ Configuration options
    --disable-static         do not build static libraries [no]
    --enable-shared          build shared libraries [no]
    --enable-small           optimize for size instead of speed
 -  --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary)
 +  --disable-runtime-cpudetect disable detecting cpu capabilities at runtime (smaller binary)
    --enable-gray            enable full grayscale support (slower color)
    --disable-swscale-alpha  disable alpha channel support in swscale
+   --disable-all            disable building components, libraries and programs
  
  Program options:
    --disable-programs       do not build command line programs
            extern AVFilter avfilter_##y##_##x ; \
            if(CONFIG_##X##_FILTER )  avfilter_register(&avfilter_##y##_##x ); }
  
 +#define REGISTER_BUILTIN_FILTER(x,y) { \
 +          extern AVFilter avfilter_##y##_##x ; \
 +          avfilter_register(&avfilter_##y##_##x ); }
 +
+ #define REGISTER_FILTER_UNCONDITIONAL(x)                                \
+     {                                                                   \
+         extern AVFilter avfilter_##x;                                   \
+         avfilter_register(&avfilter_##x);                               \
+     }
  void avfilter_register_all(void)
  {
      static int initialized;
  
      REGISTER_FILTER (NULLSINK,    nullsink,    vsink);
  
 +    /* multimedia filters */
 +    REGISTER_FILTER (CONCAT,      concat,      avf);
 +    REGISTER_FILTER (SHOWSPECTRUM,showspectrum,avf);
 +    REGISTER_FILTER (SHOWWAVES,   showwaves,   avf);
 +
 +    /* multimedia sources */
 +    REGISTER_FILTER (AMOVIE,      amovie,      avsrc);
 +    REGISTER_FILTER (MOVIE,       movie,       avsrc);
 +
 +    REGISTER_BUILTIN_FILTER (ffbuffersink,  vsink);
 +    REGISTER_BUILTIN_FILTER (ffabuffersink, asink);
 +#if !AV_HAVE_INCOMPATIBLE_FORK_ABI
 +    REGISTER_BUILTIN_FILTER (buffersink,    vsink);
 +    REGISTER_BUILTIN_FILTER (abuffersink,   asink);
 +#endif
 +
      /* those filters are part of public or internal API => registered
       * unconditionally */
-     {
-         extern AVFilter avfilter_vsrc_buffer;
-         avfilter_register(&avfilter_vsrc_buffer);
-     }
-     {
-         extern AVFilter avfilter_asrc_abuffer;
-         avfilter_register(&avfilter_asrc_abuffer);
-     }
-     {
-         extern AVFilter avfilter_vsink_buffer;
-         avfilter_register(&avfilter_vsink_buffer);
-     }
-     {
-         extern AVFilter avfilter_asink_abuffer;
-         avfilter_register(&avfilter_asink_abuffer);
-     }
-     {
-         extern AVFilter avfilter_af_afifo;
-         avfilter_register(&avfilter_af_afifo);
-     }
-     {
-         extern AVFilter avfilter_vf_fifo;
-         avfilter_register(&avfilter_vf_fifo);
-     }
+     REGISTER_FILTER_UNCONDITIONAL(asrc_abuffer);
+     REGISTER_FILTER_UNCONDITIONAL(vsrc_buffer);
+     REGISTER_FILTER_UNCONDITIONAL(asink_abuffer);
+     REGISTER_FILTER_UNCONDITIONAL(vsink_buffer);
+     REGISTER_FILTER_UNCONDITIONAL(af_afifo);
+     REGISTER_FILTER_UNCONDITIONAL(vf_fifo);
  }
@@@ -196,12 -164,11 +197,11 @@@ OBJS-$(CONFIG_MJPEG_MUXER
  OBJS-$(CONFIG_MLP_DEMUXER)               += rawdec.o
  OBJS-$(CONFIG_MLP_MUXER)                 += rawenc.o
  OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
 -OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o pcm.o
 -OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o
 +OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o
 +OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o rawenc.o
  OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o isom.o mov_chan.o
  OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o isom.o avc.o \
-                                             movenchint.o rtpenc_chain.o \
-                                             mov_chan.o rtp.o
 -                                            movenchint.o mov_chan.o
++                                            movenchint.o mov_chan.o rtp.o
  OBJS-$(CONFIG_MP2_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
  OBJS-$(CONFIG_MP3_DEMUXER)               += mp3dec.o
  OBJS-$(CONFIG_MP3_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
@@@ -321,11 -282,9 +321,11 @@@ OBJS-$(CONFIG_RTP_MUXER
  OBJS-$(CONFIG_RTSP_DEMUXER)              += rtsp.o rtspdec.o httpauth.o \
                                              urldecode.o
  OBJS-$(CONFIG_RTSP_MUXER)                += rtsp.o rtspenc.o httpauth.o \
-                                             rtpenc_chain.o urldecode.o
+                                             urldecode.o
 +OBJS-$(CONFIG_SAMI_DEMUXER)              += samidec.o
  OBJS-$(CONFIG_SAP_DEMUXER)               += sapdec.o
- OBJS-$(CONFIG_SAP_MUXER)                 += sapenc.o rtpenc_chain.o
+ OBJS-$(CONFIG_SAP_MUXER)                 += sapenc.o
 +OBJS-$(CONFIG_SBG_DEMUXER)               += sbgdec.o
  OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o
  OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
  OBJS-$(CONFIG_SEGMENT_MUXER)             += segment.o