Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
e83d098a
Commit
e83d098a
authored
Jan 02, 2015
by
Ludovic Fauvet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: fix ffmpeg version check
parent
c878a14a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
modules/codec/avcodec/va.h
modules/codec/avcodec/va.h
+2
-0
modules/hw/vdpau/avcodec.c
modules/hw/vdpau/avcodec.c
+2
-2
No files found.
modules/codec/avcodec/va.h
View file @
e83d098a
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
*****************************************************************************/
#include "avcommon_compat.h"
#ifndef VLC_AVCODEC_VA_H
#ifndef VLC_AVCODEC_VA_H
#define VLC_AVCODEC_VA_H 1
#define VLC_AVCODEC_VA_H 1
...
...
modules/hw/vdpau/avcodec.c
View file @
e83d098a
...
@@ -61,7 +61,7 @@ struct vlc_va_sys_t
...
@@ -61,7 +61,7 @@ struct vlc_va_sys_t
vlc_vdp_video_field_t
**
pool
;
vlc_vdp_video_field_t
**
pool
;
};
};
#if
(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 10, 0)
)
#if
!LIBAVCODEC_VERSION_CHECK(56, 10, 0, 19, 100
)
static
int
av_vdpau_get_surface_parameters
(
AVCodecContext
*
avctx
,
static
int
av_vdpau_get_surface_parameters
(
AVCodecContext
*
avctx
,
VdpChromaType
*
type
,
VdpChromaType
*
type
,
uint32_t
*
width
,
uint32_t
*
height
)
uint32_t
*
width
,
uint32_t
*
height
)
...
@@ -75,7 +75,7 @@ static int av_vdpau_get_surface_parameters(AVCodecContext *avctx,
...
@@ -75,7 +75,7 @@ static int av_vdpau_get_surface_parameters(AVCodecContext *avctx,
return
0
;
return
0
;
}
}
#endif
#endif
#if
(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 9, 0)
)
#if
!LIBAVCODEC_VERSION_CHECK(56, 9, 0, 18, 100
)
# define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (0)
# define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (0)
#endif
#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