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
0786bb1a
Commit
0786bb1a
authored
Dec 08, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed avcodec compilation with vaapi enabled.
PIX_FMT_DXVA2_VLD is not yet in official ffmpeg.
parent
bfcea9fa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+4
-8
No files found.
modules/codec/avcodec/video.c
View file @
0786bb1a
...
...
@@ -1113,7 +1113,9 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
[
PIX_FMT_VAAPI_IDCT
]
=
"PIX_FMT_VAAPI_IDCT"
,
[
PIX_FMT_VAAPI_VLD
]
=
"PIX_FMT_VAAPI_VLD"
,
[
PIX_FMT_VAAPI_MOCO
]
=
"PIX_FMT_VAAPI_MOCO"
,
#ifdef HAVE_AVCODEC_DXVA2
[
PIX_FMT_DXVA2_VLD
]
=
"PIX_FMT_DXVA2_VLD"
,
#endif
[
PIX_FMT_YUYV422
]
=
"PIX_FMT_YUYV422"
,
[
PIX_FMT_YUV420P
]
=
"PIX_FMT_YUV420P"
,
};
...
...
@@ -1131,21 +1133,15 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec,
continue
;
#endif
}
#ifdef HAVE_AVCODEC_DXVA2
if
(
pi_fmt
[
i
]
==
PIX_FMT_DXVA2_VLD
)
{
#ifdef HAVE_AVCODEC_DXVA2
msg_Dbg
(
p_dec
,
"Trying DXVA2"
);
p_sys
->
p_va
=
vlc_va_NewDxva2
(
VLC_OBJECT
(
p_dec
),
p_sys
->
i_codec_id
);
if
(
!
p_sys
->
p_va
)
msg_Warn
(
p_dec
,
"Failed to open DXVA2"
);
#else
continue
;
#endif
}
else
{
continue
;
}
#endif
if
(
p_sys
->
p_va
&&
p_sys
->
p_context
->
width
>
0
&&
p_sys
->
p_context
->
height
>
0
)
...
...
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