forked from FFmpeg/FFmpeg
fftools/ffmpeg_filter: remove accidental variable shadowing
Fixes potential uses of uninitialized variables in case of alloc failure. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
712140be75
commit
f632ab53d9
1 changed files with 3 additions and 3 deletions
|
@ -1920,7 +1920,7 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt)
|
||||||
FilterGraphPriv *fgp = fgp_from_fg(fg);
|
FilterGraphPriv *fgp = fgp_from_fg(fg);
|
||||||
AVBufferRef *hw_device;
|
AVBufferRef *hw_device;
|
||||||
AVFilterInOut *inputs, *outputs, *cur;
|
AVFilterInOut *inputs, *outputs, *cur;
|
||||||
int ret, i, simple = filtergraph_is_simple(fg);
|
int ret = AVERROR_BUG, i, simple = filtergraph_is_simple(fg);
|
||||||
int have_input_eof = 0;
|
int have_input_eof = 0;
|
||||||
const char *graph_desc = fgp->graph_desc;
|
const char *graph_desc = fgp->graph_desc;
|
||||||
|
|
||||||
|
@ -2029,8 +2029,8 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt)
|
||||||
sd = av_buffersink_get_side_data(sink, &nb_sd);
|
sd = av_buffersink_get_side_data(sink, &nb_sd);
|
||||||
if (nb_sd)
|
if (nb_sd)
|
||||||
for (int j = 0; j < nb_sd; j++) {
|
for (int j = 0; j < nb_sd; j++) {
|
||||||
int ret = av_frame_side_data_clone(&ofp->side_data, &ofp->nb_side_data,
|
ret = av_frame_side_data_clone(&ofp->side_data, &ofp->nb_side_data,
|
||||||
sd[j], 0);
|
sd[j], 0);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
av_frame_side_data_free(&ofp->side_data, &ofp->nb_side_data);
|
av_frame_side_data_free(&ofp->side_data, &ofp->nb_side_data);
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
Loading…
Add table
Reference in a new issue