Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AJ Martinez
SRB2
Commits
96b12f09
Commit
96b12f09
authored
6 years ago
by
Monster Iestyn
Browse files
Options
Downloads
Plain Diff
Merge branch 'apng-opengl' into 'master'
opengl apng fix See merge request
STJr/SRB2!497
parents
bfa73252
c5916337
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/m_misc.c
+8
-3
8 additions, 3 deletions
src/m_misc.c
with
8 additions
and
3 deletions
src/m_misc.c
+
8
−
3
View file @
96b12f09
...
...
@@ -1032,7 +1032,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
static
inline
moviemode_t
M_StartMovieAPNG
(
const
char
*
pathname
)
{
#ifdef USE_APNG
UINT8
*
palette
;
UINT8
*
palette
=
NULL
;
const
char
*
freename
=
NULL
;
boolean
ret
=
false
;
...
...
@@ -1048,8 +1048,13 @@ static inline moviemode_t M_StartMovieAPNG(const char *pathname)
return
MM_OFF
;
}
if
(
rendermode
==
render_soft
)
M_CreateScreenShotPalette
();
ret
=
M_SetupaPNG
(
va
(
pandf
,
pathname
,
freename
),
(
palette
=
screenshot_palette
));
if
(
rendermode
==
render_soft
)
{
M_CreateScreenShotPalette
();
palette
=
screenshot_palette
;
}
ret
=
M_SetupaPNG
(
va
(
pandf
,
pathname
,
freename
),
palette
);
if
(
!
ret
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment