Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
ff098171
Commit
ff098171
authored
Nov 04, 2013
by
Felix Abecassis
Committed by
Jean-Baptiste Kempf
Nov 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move copy.{c,h} from module avcodec to module video_chroma.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
87763908
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
modules/codec/Makefile.am
modules/codec/Makefile.am
+3
-3
modules/codec/avcodec/dxva2.c
modules/codec/avcodec/dxva2.c
+1
-1
modules/codec/avcodec/vaapi.c
modules/codec/avcodec/vaapi.c
+1
-1
modules/codec/avcodec/vda.c
modules/codec/avcodec/vda.c
+1
-1
modules/video_chroma/copy.c
modules/video_chroma/copy.c
+0
-0
modules/video_chroma/copy.h
modules/video_chroma/copy.h
+2
-3
No files found.
modules/codec/Makefile.am
View file @
ff098171
...
...
@@ -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
...
...
modules/codec/avcodec/dxva2.c
View file @
ff098171
...
...
@@ -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
*
);
...
...
modules/codec/avcodec/vaapi.c
View file @
ff098171
...
...
@@ -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) \
...
...
modules/codec/avcodec/vda.c
View file @
ff098171
...
...
@@ -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>
...
...
modules/
codec/avcodec
/copy.c
→
modules/
video_chroma
/copy.c
View file @
ff098171
File moved
modules/
codec/avcodec
/copy.h
→
modules/
video_chroma
/copy.h
View file @
ff098171
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment