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
10028116
Commit
10028116
authored
Jun 01, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid an error (no ffmpeg-hw option) when not compiling with vaapi support.
Also updated a bit more against old ffmpeg version.
parent
03071b8a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+6
-1
No files found.
modules/codec/avcodec/video.c
View file @
10028116
...
@@ -108,9 +108,10 @@ static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *, AVFrame * );
...
@@ -108,9 +108,10 @@ static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *, AVFrame * );
static
void
ffmpeg_ReleaseFrameBuf
(
struct
AVCodecContext
*
,
AVFrame
*
);
static
void
ffmpeg_ReleaseFrameBuf
(
struct
AVCodecContext
*
,
AVFrame
*
);
static
void
ffmpeg_NextPts
(
decoder_t
*
);
static
void
ffmpeg_NextPts
(
decoder_t
*
);
#ifdef HAVE_AVCODEC_VAAPI
static
enum
PixelFormat
ffmpeg_GetFormat
(
AVCodecContext
*
,
static
enum
PixelFormat
ffmpeg_GetFormat
(
AVCodecContext
*
,
const
enum
PixelFormat
*
);
const
enum
PixelFormat
*
);
#endif
static
uint32_t
ffmpeg_CodecTag
(
vlc_fourcc_t
fcc
)
static
uint32_t
ffmpeg_CodecTag
(
vlc_fourcc_t
fcc
)
{
{
...
@@ -331,8 +332,10 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
...
@@ -331,8 +332,10 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys
->
p_context
->
release_buffer
=
ffmpeg_ReleaseFrameBuf
;
p_sys
->
p_context
->
release_buffer
=
ffmpeg_ReleaseFrameBuf
;
p_sys
->
p_context
->
opaque
=
p_dec
;
p_sys
->
p_context
->
opaque
=
p_dec
;
#ifdef HAVE_AVCODEC_VAAPI
if
(
var_CreateGetBool
(
p_dec
,
"ffmpeg-hw"
)
)
if
(
var_CreateGetBool
(
p_dec
,
"ffmpeg-hw"
)
)
p_sys
->
p_context
->
get_format
=
ffmpeg_GetFormat
;
p_sys
->
p_context
->
get_format
=
ffmpeg_GetFormat
;
#endif
/* ***** misc init ***** */
/* ***** misc init ***** */
p_sys
->
input_pts
=
p_sys
->
input_dts
=
0
;
p_sys
->
input_pts
=
p_sys
->
input_dts
=
0
;
...
@@ -1120,6 +1123,7 @@ static void ffmpeg_NextPts( decoder_t *p_dec )
...
@@ -1120,6 +1123,7 @@ static void ffmpeg_NextPts( decoder_t *p_dec )
}
}
}
}
#ifdef HAVE_AVCODEC_VAAPI
static
enum
PixelFormat
ffmpeg_GetFormat
(
AVCodecContext
*
p_codec
,
static
enum
PixelFormat
ffmpeg_GetFormat
(
AVCodecContext
*
p_codec
,
const
enum
PixelFormat
*
pi_fmt
)
const
enum
PixelFormat
*
pi_fmt
)
{
{
...
@@ -1168,4 +1172,5 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
...
@@ -1168,4 +1172,5 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
/* Fallback to default behaviour */
/* Fallback to default behaviour */
return
avcodec_default_get_format
(
p_codec
,
pi_fmt
);
return
avcodec_default_get_format
(
p_codec
,
pi_fmt
);
}
}
#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