diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 14:36:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 15:08:04 +0200 |
| commit | 476471495265a5bfa52f1235aa432d7409e28136 (patch) | |
| tree | 39c92070d755abaa2d2a823e3388633bd12a11fe /libavfilter | |
| parent | 8945dcbb52b6b87e1e6479912cce89c7da54ec43 (diff) | |
| parent | ad8159e0fe2bfc1c34739f0956ce464f9859b5a7 (diff) | |
| download | ffmpeg-476471495265a5bfa52f1235aa432d7409e28136.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/settb.c | 5 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/settb.c b/libavfilter/settb.c index d511c14ce3..a21663fd7e 100644 --- a/libavfilter/settb.c +++ b/libavfilter/settb.c @@ -32,6 +32,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/rational.h" +#include "audio.h" #include "avfilter.h" #include "internal.h" #include "audio.h" @@ -151,7 +152,7 @@ AVFilter ff_vf_settb = { .inputs = avfilter_vf_settb_inputs, .outputs = avfilter_vf_settb_outputs, }; -#endif +#endif /* CONFIG_SETTB_FILTER */ #if CONFIG_ASETTB_FILTER @@ -184,4 +185,4 @@ AVFilter ff_af_asettb = { .outputs = avfilter_af_asettb_outputs, .priv_class = &asettb_class, }; -#endif +#endif /* CONFIG_ASETTB_FILTER */ diff --git a/libavfilter/version.h b/libavfilter/version.h index ac1dac68d1..1540d55bb0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #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, \ |