From 00135a87f04c1d288f8b75fe1df0a28531aced4e Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 18 Dec 2015 01:57:35 +0100 Subject: [PATCH] sub: rename sd_lavc_conv.c to lavc_conv.c The previous commit turned sd_lavc_conv from a sd_driver to free-standing functions. Do the rename to reflect this change separately to avoid confusing git's content tracking. (Or did git solve this, making separating renames and content changes unnecessary?) --- TOOLS/old-makefile | 2 +- sub/{sd_lavc_conv.c => lavc_conv.c} | 0 wscript_build.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sub/{sd_lavc_conv.c => lavc_conv.c} (100%) 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 similarity index 100% rename from sub/sd_lavc_conv.c rename to 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" ),