Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
14e3a156
Commit
14e3a156
authored
Jan 08, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix include order in VAAPI
You cannot check HAVE_AVCODEC_VAAPI before including "avcodec.h"
parent
ac0d798c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
modules/codec/avcodec/vaapi.c
modules/codec/avcodec/vaapi.c
+6
-4
No files found.
modules/codec/avcodec/vaapi.c
View file @
14e3a156
...
@@ -31,9 +31,6 @@
...
@@ -31,9 +31,6 @@
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
# include <libavcodec/avcodec.h>
# ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
# endif
#elif defined(HAVE_FFMPEG_AVCODEC_H)
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
...
@@ -45,10 +42,15 @@
...
@@ -45,10 +42,15 @@
#ifdef HAVE_AVCODEC_VAAPI
#ifdef HAVE_AVCODEC_VAAPI
#if defined( HAVE_LIBAVCODEC_AVCODEC_H )
# include <libavcodec/vaapi.h>
#else
# error "Missing VAAPI header"
#endif
#include <X11/Xlib.h>
#include <X11/Xlib.h>
#include <va/va_x11.h>
#include <va/va_x11.h>
typedef
struct
typedef
struct
{
{
VASurfaceID
i_id
;
VASurfaceID
i_id
;
...
...
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