Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
magic-lantern
magic-lantern
Commits
9da652b19b46
Commit
a7a40ea3
authored
Aug 17, 2017
by
Erwin Houtsma
Browse files
Playback of compressed raw footage.
Fix of malloc error. --HG-- branch : crop_rec_4k
parent
33f83cb3c465
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/mlv_play/mlv_play.c
View file @
9da652b1
...
...
@@ -1914,7 +1914,7 @@ static void mlv_play_mlv(char *filename, FILE **chunk_files, uint32_t chunk_coun
int
mem_size
=
(
buffer
->
frameSize
+
0x1000
)
&
~
0xFFF
;
/* keep in mind the address must be aligned, alloc a few k more */
mlv_play_decomp_buf
=
malloc
(
mem_size
+
0x1000
);
mlv_play_decomp_buf
=
fio_
malloc
(
mem_size
+
0x1000
);
if
(
!
mlv_play_decomp_buf
)
{
bmp_printf
(
FONT_MED
,
20
,
100
,
"failed to alloc mlv_play_decomp_buf"
);
...
...
@@ -2849,6 +2849,12 @@ static unsigned int mlv_play_init()
Start_DecodeLosslessPath
=
(
void
*
)
0xFF3CB0D8
;
Cleanup_DecodeLosslessPath
=
(
void
*
)
0xFF3CB23C
;
}
if
(
is_camera
(
"700D"
,
"1.1.4"
))
{
Setup_DecodeLosslessRawPath
=
(
void
*
)
0xFF4294DC
;
Start_DecodeLosslessPath
=
(
void
*
)
0xFF4295A4
;
Cleanup_DecodeLosslessPath
=
(
void
*
)
0xFF429708
;
}
/* all functions known? having the semaphore is an indicator we can decompress */
if
(
Setup_DecodeLosslessRawPath
&&
Start_DecodeLosslessPath
&&
Cleanup_DecodeLosslessPath
)
...
...
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