diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 18:11:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 18:25:15 +0200 |
| commit | 0652ffc69a99683a4e6e86e5550824c878a75c73 (patch) | |
| tree | 06dc03ddbe42bbd0c64a5fc213cec80d4e80fdcd | |
| parent | 91a0d3af651732d80b5c01777ea1c7ec541ec554 (diff) | |
| parent | b33c64e4c2e0fd2484352c5eef3c667ad094ca27 (diff) | |
| download | ffmpeg-0652ffc69a99683a4e6e86e5550824c878a75c73.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_settb: rename to settb
Conflicts:
libavfilter/Makefile
libavfilter/f_settb.c
libavfilter/settb.c
libavfilter/vf_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/Makefile | 4 | ||||
| -rw-r--r-- | libavfilter/settb.c (renamed from libavfilter/f_settb.c) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 0e1748f78a..7e66c91668 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -72,7 +72,7 @@ OBJS-$(CONFIG_ASENDCMD_FILTER) += f_sendcmd.o OBJS-$(CONFIG_ASETNSAMPLES_FILTER) += af_asetnsamples.o OBJS-$(CONFIG_ASETPTS_FILTER) += setpts.o OBJS-$(CONFIG_ASETRATE_FILTER) += af_asetrate.o -OBJS-$(CONFIG_ASETTB_FILTER) += f_settb.o +OBJS-$(CONFIG_ASETTB_FILTER) += settb.o OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o OBJS-$(CONFIG_ASPLIT_FILTER) += split.o OBJS-$(CONFIG_ASTATS_FILTER) += af_astats.o @@ -193,7 +193,7 @@ OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o OBJS-$(CONFIG_SETFIELD_FILTER) += vf_setfield.o OBJS-$(CONFIG_SETPTS_FILTER) += setpts.o OBJS-$(CONFIG_SETSAR_FILTER) += vf_aspect.o -OBJS-$(CONFIG_SETTB_FILTER) += f_settb.o +OBJS-$(CONFIG_SETTB_FILTER) += settb.o OBJS-$(CONFIG_SHOWINFO_FILTER) += vf_showinfo.o OBJS-$(CONFIG_SHUFFLEPLANES_FILTER) += vf_shuffleplanes.o OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o diff --git a/libavfilter/f_settb.c b/libavfilter/settb.c index d511c14ce3..d511c14ce3 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/settb.c |