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
d860084c
Commit
d860084c
authored
May 28, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mpegvideo: Reset bitstream_buffer_size on allocation failure
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e5d1152c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+3
-1
mpegvideo.c
libavcodec/mpegvideo.c
+3
-1
No files found.
libavcodec/mpeg4videodec.c
View file @
d860084c
...
@@ -2670,8 +2670,10 @@ int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
...
@@ -2670,8 +2670,10 @@ int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
av_fast_padded_malloc
(
&
s
->
bitstream_buffer
,
av_fast_padded_malloc
(
&
s
->
bitstream_buffer
,
&
s
->
allocated_bitstream_buffer_size
,
&
s
->
allocated_bitstream_buffer_size
,
buf_size
-
current_pos
);
buf_size
-
current_pos
);
if
(
!
s
->
bitstream_buffer
)
if
(
!
s
->
bitstream_buffer
)
{
s
->
bitstream_buffer_size
=
0
;
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
memcpy
(
s
->
bitstream_buffer
,
buf
+
current_pos
,
memcpy
(
s
->
bitstream_buffer
,
buf
+
current_pos
,
buf_size
-
current_pos
);
buf_size
-
current_pos
);
s
->
bitstream_buffer_size
=
buf_size
-
current_pos
;
s
->
bitstream_buffer_size
=
buf_size
-
current_pos
;
...
...
libavcodec/mpegvideo.c
View file @
d860084c
...
@@ -1049,8 +1049,10 @@ do {\
...
@@ -1049,8 +1049,10 @@ do {\
av_fast_malloc
(
&
s
->
bitstream_buffer
,
av_fast_malloc
(
&
s
->
bitstream_buffer
,
&
s
->
allocated_bitstream_buffer_size
,
&
s
->
allocated_bitstream_buffer_size
,
s1
->
allocated_bitstream_buffer_size
);
s1
->
allocated_bitstream_buffer_size
);
if
(
!
s
->
bitstream_buffer
)
if
(
!
s
->
bitstream_buffer
)
{
s
->
bitstream_buffer_size
=
0
;
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
}
}
s
->
bitstream_buffer_size
=
s1
->
bitstream_buffer_size
;
s
->
bitstream_buffer_size
=
s1
->
bitstream_buffer_size
;
memcpy
(
s
->
bitstream_buffer
,
s1
->
bitstream_buffer
,
memcpy
(
s
->
bitstream_buffer
,
s1
->
bitstream_buffer
,
...
...
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