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
929692f4
Commit
929692f4
authored
Mar 05, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
av_vdpau_alloc_context replacement for FFmpeg
parent
55fbe11e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
modules/codec/avcodec/avcommon_compat.h
modules/codec/avcodec/avcommon_compat.h
+4
-0
modules/codec/avcodec/hwdummy.c
modules/codec/avcodec/hwdummy.c
+1
-0
modules/hw/vdpau/avcodec.c
modules/hw/vdpau/avcodec.c
+1
-0
No files found.
modules/codec/avcodec/avcommon_compat.h
View file @
929692f4
...
...
@@ -479,6 +479,10 @@ enum {
# define err_recognition error_recognition
#endif
#if LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR <= 42 && LIBAVCODEC_VERSION_MICRO >= 100
# define av_vdpau_alloc_context av_alloc_vdpaucontext
#endif
#endif
/* HAVE_LIBAVCODEC_AVCODEC_H */
#ifdef HAVE_LIBAVUTIL_AVUTIL_H
...
...
modules/codec/avcodec/hwdummy.c
View file @
929692f4
...
...
@@ -34,6 +34,7 @@
#include <vlc_fourcc.h>
#include <vlc_picture.h>
#include "../../codec/avcodec/va.h"
#include "../../codec/avcodec/avcommon_compat.h"
static
int
Open
(
vlc_va_t
*
,
AVCodecContext
*
,
const
es_format_t
*
);
static
void
Close
(
vlc_va_t
*
);
...
...
modules/hw/vdpau/avcodec.c
View file @
929692f4
...
...
@@ -37,6 +37,7 @@
#include <vlc_xlib.h>
#include "vlc_vdpau.h"
#include "../../codec/avcodec/va.h"
#include "../../codec/avcodec/avcommon_compat.h"
static
int
Open
(
vlc_va_t
*
,
AVCodecContext
*
,
const
es_format_t
*
);
static
void
Close
(
vlc_va_t
*
);
...
...
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