Move copy.{c,h} from module avcodec to module video_chroma.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index e65945af9310ee90eab6118afea0d81cd6c7f868..6e21d5813bac03a7b782b86bcaf65922c8b5f2ad 100644 (file)
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -263,7 +263,7 @@ endif
 ### avcodec hardware acceleration ###
 
 libvaapi_plugin_la_SOURCES = \
-       codec/avcodec/copy.c codec/avcodec/copy.h \
+       video_chroma/copy.c video_chroma/copy.h \
        codec/avcodec/vaapi.c
 libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) \
        $(LIBVA_CFLAGS) $(X_CFLAGS) $(AVCODEC_CFLAGS)
@@ -273,7 +273,7 @@ codec_LTLIBRARIES += libvaapi_plugin.la
 endif
 
 libdxva2_plugin_la_SOURCES = \
-       codec/avcodec/copy.c codec/avcodec/copy.h \
+       video_chroma/copy.c video_chroma/copy.h \
        codec/avcodec/dxva2.c
 libdxva2_plugin_la_LIBADD = -lole32 -lshlwapi -luuid
 if HAVE_AVCODEC_DXVA2
@@ -281,7 +281,7 @@ codec_LTLIBRARIES += libdxva2_plugin.la
 endif
 
 libvda_plugin_la_SOURCES = \
-       codec/avcodec/copy.c codec/avcodec/copy.h \
+       video_chroma/copy.c video_chroma/copy.h \
        codec/avcodec/vda.c
 libvda_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
 libvda_plugin_la_LDFLAGS = -Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 2ef69ec3c805878ad963c6c3cd6f225b2617ebc9..330daf0a3767f1c36fdf58e2ae8ad7cc16473c5b 100644 (file)
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -49,7 +49,7 @@
 
 #include "avcodec.h"
 #include "va.h"
-#include "copy.h"
+#include "../../video_chroma/copy.h"
 
 static int Open(vlc_va_t *, int, const es_format_t *);
 static void Close(vlc_va_t *);

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 5a1dddad3d48f7c8cd712fcb904e4399cd68fd47..1a7b227b1c05090346903800a52e836438eb8bf5 100644 (file)
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -39,7 +39,7 @@
 
 #include "avcodec.h"
 #include "va.h"
-#include "copy.h"
+#include "../../video_chroma/copy.h"
 
 #ifndef VA_SURFACE_ATTRIB_SETTABLE
 #define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \

diff --git a/modules/codec/avcodec/vda.c b/modules/codec/avcodec/vda.c
index 9def01f6cbe72792eeb4a756340f08bca7f55688..a0e4bbe8626e63503b82d0bceb4664396fef2b27 100644 (file)
--- a/modules/codec/avcodec/vda.c
+++ b/modules/codec/avcodec/vda.c
@@ -34,7 +34,7 @@
 
 #include "avcodec.h"
 #include "va.h"
-#include "copy.h"
+#include "../../video_chroma/copy.h"
 
 #include <libavcodec/vda.h>
 #include <VideoDecodeAcceleration/VDADecoder.h>

diff --git a/modules/codec/avcodec/copy.c b/modules/video_chroma/copy.c
similarity index 100%
rename from modules/codec/avcodec/copy.c
rename to modules/video_chroma/copy.c

diff --git a/modules/codec/avcodec/copy.h b/modules/video_chroma/copy.h
similarity index 96%
rename from modules/codec/avcodec/copy.h
rename to modules/video_chroma/copy.h
index 242dd51d131b105c6c086924066ddae265b62bef..39dbf1e19e6b110d93d141c83a57b17cdb822012 100644 (file)
--- a/modules/codec/avcodec/copy.h
+++ b/modules/video_chroma/copy.h
@@ -21,8 +21,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_AVCODEC_COPY_H
-#define _VLC_AVCODEC_COPY_H 1
+#ifndef _VLC_VIDEOCHROMA_COPY_H
+#define _VLC_VIDEOCHROMA_COPY_H 1
 
 typedef struct {
 # ifdef CAN_COMPILE_SSE2
@@ -42,4 +42,3 @@ void CopyFromYv12(picture_t *dst, uint8_t *src[3], size_t src_pitch[3],
                   copy_cache_t *cache);
 
 #endif
-