aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-04-18 13:52:00 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-04-18 13:52:00 +0000
commita208350c3c11dc71cfd1abb6d430eb705bf25303 (patch)
tree8d048a2a828f6608b0086ef6db0482b5f5d30ea1
parent0c067dc34b6313e9be4763f0cd4c3823fcf030c7 (diff)
downloadffmpeg-a208350c3c11dc71cfd1abb6d430eb705bf25303.tar.gz
Rename swscale_avoption.c to options.c.
Consistent with lavc and lavf. Originally committed as revision 29188 to svn://svn.mplayerhq.hu/mplayer/trunk/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