Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
8cf35921
Commit
8cf35921
authored
Aug 16, 2013
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: set frame samples to 0 if frame fill fails in encode, this way encode_audio2 doesn't crash
parent
04d173cc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
modules/codec/avcodec/encoder.c
modules/codec/avcodec/encoder.c
+6
-0
No files found.
modules/codec/avcodec/encoder.c
View file @
8cf35921
...
...
@@ -1157,7 +1157,10 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
p_sys
->
p_context
->
sample_fmt
,
p_sys
->
b_planar
?
p_sys
->
p_interleave_buf
:
p_sys
->
p_buffer
,
leftover
+
buffer_delay
,
align
)
<
0
)
{
msg_Err
(
p_enc
,
"filling error on fillup"
);
p_sys
->
frame
->
nb_samples
=
0
;
}
buffer_delay
=
0
;
p_sys
->
i_samples_delay
=
0
;
...
...
@@ -1250,7 +1253,10 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
p_sys
->
b_planar
?
p_sys
->
p_buffer
:
p_aout_buf
->
p_buffer
,
__MIN
(
p_sys
->
i_buffer_out
,
p_aout_buf
->
i_buffer
),
align
)
<
0
)
{
msg_Err
(
p_enc
,
"filling error on encode"
);
p_sys
->
frame
->
nb_samples
=
0
;
}
p_aout_buf
->
p_buffer
+=
(
p_sys
->
frame
->
nb_samples
*
p_enc
->
fmt_in
.
audio
.
i_channels
*
p_sys
->
i_sample_bytes
);
p_aout_buf
->
i_buffer
-=
(
p_sys
->
frame
->
nb_samples
*
p_enc
->
fmt_in
.
audio
.
i_channels
*
p_sys
->
i_sample_bytes
);
...
...
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