vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Apr 4 16:20:38 2017 +0200| [373c8d8919bc32df7169aff33a6fd50fee92c3f7] | committer: Thomas Guillem
chroma: move cvpx_i420 to cxpx
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=373c8d8919bc32df7169aff33a6fd50fee92c3f7
---
configure.ac | 2 +-
modules/MODULES_LIST | 2 +-
modules/video_chroma/Makefile.am | 8 ++++----
modules/video_chroma/{cvpx_i420.c => cvpx.c} | 5 ++---
po/POTFILES.in | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9d49795619..43ce7a3e1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3884,7 +3884,7 @@ dnl
dnl VideoToolbox plugins
AC_CHECK_HEADERS(VideoToolbox/VideoToolbox.h, [
VLC_ADD_PLUGIN([videotoolbox])
- VLC_ADD_PLUGIN([cvpx_i420])
+ VLC_ADD_PLUGIN([cvpx])
])
dnl
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 3205a0850b..24d914a9a1 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -85,7 +85,7 @@ $Id$
* croppadd: Crop/Padd image filter
* crystalhd: crystalhd decoder
* cvdsub: CVD subtitles decoder
- * cvpx_i420: filter to copy from OS X accelerated surfaces to CPU in YUV
+ * cvpx: filter to copy from OS X accelerated surfaces to CPU
* d3d11_surface: Convert D3D11 GPU textures to YUV planes
* d3d11va: Direct3D11 hardware-accelerated decoding
* daala: a daala video decoder/packetizer using libdaala
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index cf11b3b81e..5857334c25 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -132,7 +132,7 @@ chroma_LTLIBRARIES += \
libd3d11_surface_plugin.la
endif
-libcvpx_i420_plugin_la_SOURCES = video_chroma/cvpx_i420.c video_chroma/copy.c video_chroma/copy.h
-libcvpx_i420_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
-EXTRA_LTLIBRARIES += libcvpx_i420_plugin.la
-chroma_LTLIBRARIES += $(LTLIBcvpx_i420)
+libcvpx_plugin_la_SOURCES = video_chroma/cvpx.c video_chroma/copy.c video_chroma/copy.h
+libcvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
+EXTRA_LTLIBRARIES += libcvpx_plugin.la
+chroma_LTLIBRARIES += $(LTLIBcvpx)
diff --git a/modules/video_chroma/cvpx_i420.c b/modules/video_chroma/cvpx.c
similarity index 96%
rename from modules/video_chroma/cvpx_i420.c
rename to modules/video_chroma/cvpx.c
index 5d489922b8..9c6838e6a7 100644
--- a/modules/video_chroma/cvpx_i420.c
+++ b/modules/video_chroma/cvpx.c
@@ -1,8 +1,7 @@
/*****************************************************************************
- * cvpx_i420.c: core video buffer to picture converter
+ * cvpx.c: core video buffer to picture converter
*****************************************************************************
- * Copyright (C) 2015 Videolabs SAS
- * $Id$
+ * Copyright (C) 2015-2017 VLC authors, VideoLAN and VideoLabs
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
*
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 024dba53c5..ef40f8bf3e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1047,7 +1047,7 @@ modules/text_renderer/sapi.cpp
modules/text_renderer/svg.c
modules/text_renderer/tdummy.c
modules/video_chroma/chain.c
-modules/video_chroma/cvpx_i420.c
+modules/video_chroma/cvpx.c
modules/video_chroma/d3d11_surface.c
modules/video_chroma/dxa9.c
modules/video_chroma/grey_yuv.c