Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:29:15 +0000 (15:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:29:15 +0000 (15:29 +0100)
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
  hlsenc: Allocate enough space for the pattern string
  lavc: Correct the description of pkt_dts
  avfilter: Compile FIFO filters unconditionally

Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c

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

Simple merge
@@@ -33,51 -19,24 +33,51 @@@ OBJS = allfilters.
         buffersink.o                                                     \
         buffersrc.o                                                      \
         drawutils.o                                                      \
+        fifo.o                                                           \
         formats.o                                                        \
 +       graphdump.o                                                      \
         graphparser.o                                                    \
 +       sink_buffer.o                                                    \
 +       src_buffer.o                                                     \
 +       transform.o                                                      \
         video.o                                                          \
  
- OBJS-$(CONFIG_AFIFO_FILTER)                  += fifo.o
 +
 +OBJS-$(CONFIG_AVCODEC)                       += avcodec.o
 +OBJS-$(CONFIG_AVFORMAT)                      += lavfutils.o
 +OBJS-$(CONFIG_SWSCALE)                       += lswsutils.o
 +
 +OBJS-$(CONFIG_ACONVERT_FILTER)               += af_aconvert.o
  OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
 +OBJS-$(CONFIG_AMERGE_FILTER)                 += af_amerge.o
  OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o
  OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
 +OBJS-$(CONFIG_APAD_FILTER)                   += af_apad.o
 +OBJS-$(CONFIG_ARESAMPLE_FILTER)              += af_aresample.o
 +OBJS-$(CONFIG_ASELECT_FILTER)                += f_select.o
 +OBJS-$(CONFIG_ASENDCMD_FILTER)               += f_sendcmd.o
 +OBJS-$(CONFIG_ASETNSAMPLES_FILTER)           += af_asetnsamples.o
 +OBJS-$(CONFIG_ASETPTS_FILTER)                += f_setpts.o
 +OBJS-$(CONFIG_ASETTB_FILTER)                 += f_settb.o
  OBJS-$(CONFIG_ASHOWINFO_FILTER)              += af_ashowinfo.o
  OBJS-$(CONFIG_ASPLIT_FILTER)                 += split.o
 +OBJS-$(CONFIG_ASTREAMSYNC_FILTER)            += af_astreamsync.o
  OBJS-$(CONFIG_ASYNCTS_FILTER)                += af_asyncts.o
 +OBJS-$(CONFIG_ATEMPO_FILTER)                 += af_atempo.o
  OBJS-$(CONFIG_CHANNELMAP_FILTER)             += af_channelmap.o
  OBJS-$(CONFIG_CHANNELSPLIT_FILTER)           += af_channelsplit.o
 +OBJS-$(CONFIG_EARWAX_FILTER)                 += af_earwax.o
 +OBJS-$(CONFIG_EBUR128_FILTER)                += f_ebur128.o
  OBJS-$(CONFIG_JOIN_FILTER)                   += af_join.o
 +OBJS-$(CONFIG_PAN_FILTER)                    += af_pan.o
  OBJS-$(CONFIG_RESAMPLE_FILTER)               += af_resample.o
 +OBJS-$(CONFIG_SILENCEDETECT_FILTER)          += af_silencedetect.o
  OBJS-$(CONFIG_VOLUME_FILTER)                 += af_volume.o
 +OBJS-$(CONFIG_VOLUMEDETECT_FILTER)           += af_volumedetect.o
  
 +OBJS-$(CONFIG_AEVALSRC_FILTER)               += asrc_aevalsrc.o
  OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o
 +OBJS-$(CONFIG_FLITE_FILTER)                  += asrc_flite.o
  
  OBJS-$(CONFIG_ANULLSINK_FILTER)              += asink_anullsink.o
  
@@@ -92,21 -45,14 +92,20 @@@ OBJS-$(CONFIG_COLORMATRIX_FILTER
  OBJS-$(CONFIG_COPY_FILTER)                   += vf_copy.o
  OBJS-$(CONFIG_CROP_FILTER)                   += vf_crop.o
  OBJS-$(CONFIG_CROPDETECT_FILTER)             += vf_cropdetect.o
 +OBJS-$(CONFIG_DECIMATE_FILTER)               += vf_decimate.o
  OBJS-$(CONFIG_DELOGO_FILTER)                 += vf_delogo.o
 +OBJS-$(CONFIG_DESHAKE_FILTER)                += vf_deshake.o
  OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o
  OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o
 +OBJS-$(CONFIG_EDGEDETECT_FILTER)             += vf_edgedetect.o
  OBJS-$(CONFIG_FADE_FILTER)                   += vf_fade.o
 +OBJS-$(CONFIG_FIELD_FILTER)                  += vf_field.o
  OBJS-$(CONFIG_FIELDORDER_FILTER)             += vf_fieldorder.o
- OBJS-$(CONFIG_FIFO_FILTER)                   += fifo.o
  OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
 +OBJS-$(CONFIG_FRAMESTEP_FILTER)              += vf_framestep.o
  OBJS-$(CONFIG_FPS_FILTER)                    += vf_fps.o
  OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
 +OBJS-$(CONFIG_GEQ_FILTER)                    += vf_geq.o
  OBJS-$(CONFIG_GRADFUN_FILTER)                += vf_gradfun.o
  OBJS-$(CONFIG_HFLIP_FILTER)                  += vf_hflip.o
  OBJS-$(CONFIG_HQDN3D_FILTER)                 += vf_hqdn3d.o
@@@ -39,38 -35,19 +39,37 @@@ void avfilter_register_all(void
          return;
      initialized = 1;
  
-     REGISTER_FILTER (AFIFO,       afifo,       af);
 +    REGISTER_FILTER (ACONVERT,    aconvert,    af);
      REGISTER_FILTER (AFORMAT,     aformat,     af);
 +    REGISTER_FILTER (AMERGE,      amerge,      af);
      REGISTER_FILTER (AMIX,        amix,        af);
      REGISTER_FILTER (ANULL,       anull,       af);
 +    REGISTER_FILTER (APAD,        apad,        af);
 +    REGISTER_FILTER (ARESAMPLE,   aresample,   af);
 +    REGISTER_FILTER (ASELECT,     aselect,     af);
 +    REGISTER_FILTER (ASENDCMD,    asendcmd,    af);
 +    REGISTER_FILTER (ASETNSAMPLES, asetnsamples, af);
 +    REGISTER_FILTER (ASETPTS,     asetpts,     af);
 +    REGISTER_FILTER (ASETTB,      asettb,      af);
      REGISTER_FILTER (ASHOWINFO,   ashowinfo,   af);
      REGISTER_FILTER (ASPLIT,      asplit,      af);
 +    REGISTER_FILTER (ASTREAMSYNC, astreamsync, af);
      REGISTER_FILTER (ASYNCTS,     asyncts,     af);
 +    REGISTER_FILTER (ATEMPO,      atempo,      af);
      REGISTER_FILTER (CHANNELMAP,  channelmap,  af);
      REGISTER_FILTER (CHANNELSPLIT,channelsplit,af);
 +    REGISTER_FILTER (EARWAX,      earwax,      af);
 +    REGISTER_FILTER (EBUR128,     ebur128,     af);
      REGISTER_FILTER (JOIN,        join,        af);
 +    REGISTER_FILTER (PAN,         pan,         af);
      REGISTER_FILTER (RESAMPLE,    resample,    af);
 +    REGISTER_FILTER (SILENCEDETECT, silencedetect, af);
      REGISTER_FILTER (VOLUME,      volume,      af);
 +    REGISTER_FILTER (VOLUMEDETECT,volumedetect,af);
  
 +    REGISTER_FILTER (AEVALSRC,    aevalsrc,    asrc);
      REGISTER_FILTER (ANULLSRC,    anullsrc,    asrc);
 +    REGISTER_FILTER (FLITE,       flite,       asrc);
  
      REGISTER_FILTER (ANULLSINK,   anullsink,   asink);
  
      REGISTER_FILTER (COPY,        copy,        vf);
      REGISTER_FILTER (CROP,        crop,        vf);
      REGISTER_FILTER (CROPDETECT,  cropdetect,  vf);
 +    REGISTER_FILTER (DECIMATE,    decimate,    vf);
      REGISTER_FILTER (DELOGO,      delogo,      vf);
 +    REGISTER_FILTER (DESHAKE,     deshake,     vf);
      REGISTER_FILTER (DRAWBOX,     drawbox,     vf);
      REGISTER_FILTER (DRAWTEXT,    drawtext,    vf);
 +    REGISTER_FILTER (EDGEDETECT,  edgedetect,  vf);
      REGISTER_FILTER (FADE,        fade,        vf);
 +    REGISTER_FILTER (FIELD,       field,       vf);
      REGISTER_FILTER (FIELDORDER,  fieldorder,  vf);
-     REGISTER_FILTER (FIFO,        fifo,        vf);
      REGISTER_FILTER (FORMAT,      format,      vf);
      REGISTER_FILTER (FPS,         fps,         vf);
 +    REGISTER_FILTER (FRAMESTEP,   framestep,   vf);
      REGISTER_FILTER (FREI0R,      frei0r,      vf);
 +    REGISTER_FILTER (GEQ,         geq,         vf);
      REGISTER_FILTER (GRADFUN,     gradfun,     vf);
      REGISTER_FILTER (HFLIP,       hflip,       vf);
      REGISTER_FILTER (HQDN3D,      hqdn3d,      vf);