Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 12:36:24 +0000 (14:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 13:08:04 +0000 (15:08 +0200)
* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h

See: ba856c0be5599f21f241162e1f5f3f2506f3132c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/settb.c
libavfilter/version.h

  #include "libavutil/mathematics.h"
  #include "libavutil/opt.h"
  #include "libavutil/rational.h"
+ #include "audio.h"
  #include "avfilter.h"
  #include "internal.h"
 +#include "audio.h"
  #include "video.h"
  
  static const char *const var_names[] = {
@@@ -144,19 -154,25 +145,19 @@@ static const AVFilterPad avfilter_vf_se
  };
  
  AVFilter ff_vf_settb = {
 -    .name      = "settb",
 +    .name        = "settb",
      .description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."),
 -
 -    .priv_size = sizeof(SetTBContext),
 -    .priv_class = &settb_class,
 -
 -    .inputs    = avfilter_vf_settb_inputs,
 -
 -    .outputs   = avfilter_vf_settb_outputs,
 +    .priv_size   = sizeof(SetTBContext),
 +    .priv_class  = &settb_class,
 +    .inputs      = avfilter_vf_settb_inputs,
 +    .outputs     = avfilter_vf_settb_outputs,
  };
- #endif
+ #endif /* CONFIG_SETTB_FILTER */
  
  #if CONFIG_ASETTB_FILTER
 -static const AVClass asettb_class = {
 -    .class_name = "asettb",
 -    .item_name  = av_default_item_name,
 -    .option     = options,
 -    .version    = LIBAVUTIL_VERSION_INT,
 -};
 +
 +DEFINE_OPTIONS(asettb, AUDIO);
 +AVFILTER_DEFINE_CLASS(asettb);
  
  static const AVFilterPad avfilter_af_asettb_inputs[] = {
      {
@@@ -29,9 -29,9 +29,9 @@@
  
  #include "libavutil/version.h"
  
 -#define LIBAVFILTER_VERSION_MAJOR  4
 -#define LIBAVFILTER_VERSION_MINOR  4
 -#define LIBAVFILTER_VERSION_MICRO  0
 +#define LIBAVFILTER_VERSION_MAJOR   4
- #define LIBAVFILTER_VERSION_MINOR   3
++#define LIBAVFILTER_VERSION_MINOR   4
 +#define LIBAVFILTER_VERSION_MICRO 100
  
  #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                 LIBAVFILTER_VERSION_MINOR, \