summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TOOLS/old-makefile2
-rw-r--r--sub/lavc_conv.c (renamed from sub/sd_lavc_conv.c)0
-rw-r--r--wscript_build.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile
index c5bb33c0bb..f74f6e6fb7 100644
--- a/TOOLS/old-makefile
+++ b/TOOLS/old-makefile
@@ -221,9 +221,9 @@ SOURCES = audio/audio.c \
sub/dec_sub.c \
sub/draw_bmp.c \
sub/img_convert.c \
+ sub/lavc_conv.c \
sub/osd.c \
sub/sd_lavc.c \
- sub/sd_lavc_conv.c \
ta/ta.c \
ta/ta_utils.c \
ta/ta_talloc.c \
diff --git a/sub/sd_lavc_conv.c b/sub/lavc_conv.c
index 21e54c04a7..21e54c04a7 100644
--- a/sub/sd_lavc_conv.c
+++ b/sub/lavc_conv.c
diff --git a/wscript_build.py b/wscript_build.py
index f04a610b83..ab2df805e2 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -254,12 +254,12 @@ def build(ctx):
( "sub/dec_sub.c" ),
( "sub/draw_bmp.c" ),
( "sub/img_convert.c" ),
+ ( "sub/lavc_conv.c" ),
( "sub/osd.c" ),
( "sub/osd_dummy.c", "dummy-osd" ),
( "sub/osd_libass.c", "libass-osd" ),
( "sub/sd_ass.c", "libass" ),
( "sub/sd_lavc.c" ),
- ( "sub/sd_lavc_conv.c" ),
## Video
( "video/csputils.c" ),