diff options
| author | wm4 <wm4@nowhere> | 2015-12-18 01:57:35 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-12-18 03:59:52 +0100 |
| commit | 00135a87f04c1d288f8b75fe1df0a28531aced4e (patch) | |
| tree | 50afe7779b7e33d9ac49321d95b43493300e0180 | |
| parent | 687b552db186af66e97c58792b2db40294e92bad (diff) | |
| download | mpv-00135a87f04c1d288f8b75fe1df0a28531aced4e.tar.bz2 mpv-00135a87f04c1d288f8b75fe1df0a28531aced4e.tar.xz | |
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?)
| -rw-r--r-- | TOOLS/old-makefile | 2 | ||||
| -rw-r--r-- | sub/lavc_conv.c (renamed from sub/sd_lavc_conv.c) | 0 | ||||
| -rw-r--r-- | wscript_build.py | 2 |
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" ), |