RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: ba856c0be5 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-10 14:36:24 +02:00
parent 8945dcbb52 ad8159e0fe
commit 4764714952
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/settb.c
View File

@ -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 */

2
libavfilter/version.h
View File

@ -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, \