Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ecf94986
Commit
ecf94986
authored
Apr 01, 2011
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation with --disable-vdpau
parent
2a0bd2bf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
configure
configure
+2
-0
mpeg12.c
libavcodec/mpeg12.c
+1
-1
No files found.
configure
View file @
ecf94986
...
@@ -1301,9 +1301,11 @@ mpeg4_decoder_select="h263_decoder mpeg4video_parser"
...
@@ -1301,9 +1301,11 @@ mpeg4_decoder_select="h263_decoder mpeg4video_parser"
mpeg4_encoder_select
=
"h263_encoder"
mpeg4_encoder_select
=
"h263_encoder"
mpeg_vdpau_decoder_select
=
"vdpau mpegvideo_decoder"
mpeg_vdpau_decoder_select
=
"vdpau mpegvideo_decoder"
mpeg1_vdpau_decoder_select
=
"vdpau mpeg1video_decoder"
mpeg1_vdpau_decoder_select
=
"vdpau mpeg1video_decoder"
mpeg1_vdpau_hwaccel_select
=
"vdpau mpeg1video_decoder"
mpeg2_crystalhd_decoder_select
=
"crystalhd"
mpeg2_crystalhd_decoder_select
=
"crystalhd"
mpeg2_dxva2_hwaccel_deps
=
"dxva2api_h"
mpeg2_dxva2_hwaccel_deps
=
"dxva2api_h"
mpeg2_dxva2_hwaccel_select
=
"dxva2 mpeg2video_decoder"
mpeg2_dxva2_hwaccel_select
=
"dxva2 mpeg2video_decoder"
mpeg2_vdpau_hwaccel_select
=
"vdpau mpeg2video_decoder"
mpeg2_vaapi_hwaccel_select
=
"vaapi mpeg2video_decoder"
mpeg2_vaapi_hwaccel_select
=
"vaapi mpeg2video_decoder"
mpeg4_crystalhd_decoder_select
=
"crystalhd"
mpeg4_crystalhd_decoder_select
=
"crystalhd"
mpeg4_vaapi_hwaccel_select
=
"vaapi mpeg4_decoder"
mpeg4_vaapi_hwaccel_select
=
"vaapi mpeg4_decoder"
...
...
libavcodec/mpeg12.c
View file @
ecf94986
...
@@ -2331,7 +2331,7 @@ static int decode_chunks(AVCodecContext *avctx,
...
@@ -2331,7 +2331,7 @@ static int decode_chunks(AVCodecContext *avctx,
s2
->
error_count
+=
s2
->
thread_context
[
i
]
->
error_count
;
s2
->
error_count
+=
s2
->
thread_context
[
i
]
->
error_count
;
}
}
if
(
uses_vdpau
(
avctx
))
if
(
CONFIG_MPEG_VDPAU_DECODER
&&
uses_vdpau
(
avctx
))
ff_vdpau_mpeg_picture_complete
(
s2
,
buf
,
buf_size
,
s
->
slice_count
);
ff_vdpau_mpeg_picture_complete
(
s2
,
buf
,
buf_size
,
s
->
slice_count
);
if
(
slice_end
(
avctx
,
picture
))
{
if
(
slice_end
(
avctx
,
picture
))
{
...
...
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