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
c8926215
Commit
c8926215
authored
Jan 20, 2014
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
parent
4014b401
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
mpeg12dec.c
libavcodec/mpeg12dec.c
+3
-3
No files found.
libavcodec/mpeg12dec.c
View file @
c8926215
...
...
@@ -770,7 +770,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
memset
(
s
->
last_mv
,
0
,
sizeof
(
s
->
last_mv
));
/* reset mv prediction */
s
->
mb_intra
=
1
;
// if 1, we memcpy blocks in xvmcvideo
if
(
CONFIG_XVMC
&&
s
->
pack_pblocks
)
{
if
(
(
CONFIG_MPEG1_XVMC_HWACCEL
||
CONFIG_MPEG2_XVMC_HWACCEL
)
&&
s
->
pack_pblocks
)
{
ff_xvmc_pack_pblocks
(
s
,
-
1
);
// inter are always full blocks
}
...
...
@@ -986,7 +986,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
}
//if 1, we memcpy blocks in xvmcvideo
if
(
CONFIG_XVMC
&&
s
->
pack_pblocks
)
{
if
(
(
CONFIG_MPEG1_XVMC_HWACCEL
||
CONFIG_MPEG2_XVMC_HWACCEL
)
&&
s
->
pack_pblocks
)
{
ff_xvmc_pack_pblocks
(
s
,
cbp
);
}
...
...
@@ -1700,7 +1700,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
for
(;;)
{
// If 1, we memcpy blocks in xvmcvideo.
if
(
CONFIG_XVMC
&&
s
->
pack_pblocks
)
if
(
(
CONFIG_MPEG1_XVMC_HWACCEL
||
CONFIG_MPEG2_XVMC_HWACCEL
)
&&
s
->
pack_pblocks
)
ff_xvmc_init_block
(
s
);
// set s->block
if
(
mpeg_decode_mb
(
s
,
s
->
block
)
<
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