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
392d975e
Commit
392d975e
authored
Feb 10, 2015
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: fix clobbered ff_get_buffer()
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
9b22e460
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
15 deletions
+5
-15
atrac3plusdec.c
libavcodec/atrac3plusdec.c
+1
-3
fic.c
libavcodec/fic.c
+1
-3
on2avc.c
libavcodec/on2avc.c
+2
-6
opusdec.c
libavcodec/opusdec.c
+1
-3
No files found.
libavcodec/atrac3plusdec.c
View file @
392d975e
...
...
@@ -333,10 +333,8 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data,
float
**
samples_p
=
(
float
**
)
frame
->
extended_data
;
frame
->
nb_samples
=
ATRAC3P_FRAME_SAMPLES
;
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
return
ret
;
}
if
((
ret
=
init_get_bits8
(
&
ctx
->
gb
,
avpkt
->
data
,
avpkt
->
size
))
<
0
)
return
ret
;
...
...
libavcodec/fic.c
View file @
392d975e
...
...
@@ -266,10 +266,8 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
int
skip_cursor
=
0
;
uint8_t
*
sdata
;
if
((
ret
=
ff_reget_buffer
(
avctx
,
ctx
->
frame
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
if
((
ret
=
ff_reget_buffer
(
avctx
,
ctx
->
frame
))
<
0
)
return
ret
;
}
/* Header + at least one slice (4) */
if
(
avpkt
->
size
<
FIC_HEADER_SIZE
+
4
)
{
...
...
libavcodec/on2avc.c
View file @
392d975e
...
...
@@ -848,10 +848,8 @@ static int on2avc_decode_frame(AVCodecContext * avctx, void *data,
if
(
c
->
is_av500
)
{
/* get output buffer */
frame
->
nb_samples
=
ON2AVC_SUBFRAME_SIZE
;
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
return
ret
;
}
if
((
ret
=
on2avc_decode_subframe
(
c
,
buf
,
buf_size
,
frame
,
0
))
<
0
)
return
ret
;
...
...
@@ -874,10 +872,8 @@ static int on2avc_decode_frame(AVCodecContext * avctx, void *data,
/* get output buffer */
frame
->
nb_samples
=
ON2AVC_SUBFRAME_SIZE
*
num_frames
;
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
return
ret
;
}
audio_off
=
0
;
bytestream2_init
(
&
gb
,
buf
,
buf_size
);
...
...
libavcodec/opusdec.c
View file @
392d975e
...
...
@@ -474,10 +474,8 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
/* setup the data buffers */
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
);
if
(
ret
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
if
(
ret
<
0
)
return
ret
;
}
frame
->
nb_samples
=
0
;
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
{
...
...
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