summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-04-18 13:52:00 +0000
committerstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-04-18 13:52:00 +0000
commit9be7c4ad97b546616d0ce886f53c804a4a58991c (patch)
tree7d45548ecf23b0db35f8961b85934ab1a31943ec /libswscale
parentd5b3f76234f79a1070c29acd1eb632587c24d207 (diff)
downloadmpv-9be7c4ad97b546616d0ce886f53c804a4a58991c.tar.bz2
mpv-9be7c4ad97b546616d0ce886f53c804a4a58991c.tar.xz
Rename swscale_avoption.c to options.c.
Consistent with lavc and lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29188 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/Makefile2
-rw-r--r--libswscale/options.c (renamed from libswscale/swscale_avoption.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile
index c209ad8984..247ae8d239 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -5,7 +5,7 @@ FFLIBS = avutil
HEADERS = swscale.h
-OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb.o
+OBJS = options.o rgb2rgb.o swscale.o yuv2rgb.o
OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \
bfin/swscale_bfin.o \
diff --git a/libswscale/swscale_avoption.c b/libswscale/options.c
index 996843df1d..996843df1d 100644
--- a/libswscale/swscale_avoption.c
+++ b/libswscale/options.c