videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Felix Abecassis 2013-11-04 14:45:21 +01:00 committed by Jean-Baptiste Kempf
parent 87763908b8
commit ff09817195
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/codec/Makefile.am
View File

@ -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

2
modules/codec/avcodec/dxva2.c
View File

@ -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 *);

2
modules/codec/avcodec/vaapi.c
View File

@ -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) \

2
modules/codec/avcodec/vda.c
View File

@ -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>

0
modules/codec/avcodec/copy.c → modules/video_chroma/copy.c
View File

5
modules/codec/avcodec/copy.h → modules/video_chroma/copy.h
View File

@ -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