diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-31 11:18:29 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-02-17 12:58:20 +0100 |
| commit | 2a14b23484be9b63584d4b534cc6e5fb7d53454d (patch) | |
| tree | 6c2e8135e5cdcbceb641cac46d472214a2e2debe /libavfilter | |
| parent | 08d149d6889bcf56c9463c153860b89a3c3d2615 (diff) | |
| download | ffmpeg-2a14b23484be9b63584d4b534cc6e5fb7d53454d.tar.gz | |
lavfi: rename vf_ass.c to vf_subtitles.c
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 4 | ||||
| -rw-r--r-- | libavfilter/vf_subtitles.c (renamed from libavfilter/vf_ass.c) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ff69d098d7..2449da4fcd 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -94,7 +94,7 @@ OBJS-$(CONFIG_FLITE_FILTER) += asrc_flite.o OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o -OBJS-$(CONFIG_ASS_FILTER) += vf_ass.o +OBJS-$(CONFIG_ASS_FILTER) += vf_subtitles.o OBJS-$(CONFIG_ALPHAEXTRACT_FILTER) += vf_alphaextract.o OBJS-$(CONFIG_ALPHAMERGE_FILTER) += vf_alphamerge.o OBJS-$(CONFIG_BBOX_FILTER) += bbox.o vf_bbox.o @@ -153,7 +153,7 @@ OBJS-$(CONFIG_SETTB_FILTER) += f_settb.o OBJS-$(CONFIG_SHOWINFO_FILTER) += vf_showinfo.o OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o OBJS-$(CONFIG_SPLIT_FILTER) += split.o -OBJS-$(CONFIG_SUBTITLES_FILTER) += vf_ass.o +OBJS-$(CONFIG_SUBTITLES_FILTER) += vf_subtitles.o OBJS-$(CONFIG_SUPER2XSAI_FILTER) += vf_super2xsai.o OBJS-$(CONFIG_SWAPUV_FILTER) += vf_swapuv.o OBJS-$(CONFIG_THUMBNAIL_FILTER) += vf_thumbnail.o diff --git a/libavfilter/vf_ass.c b/libavfilter/vf_subtitles.c index c4bc755be3..c4bc755be3 100644 --- a/libavfilter/vf_ass.c +++ b/libavfilter/vf_subtitles.c |