virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/frame_thread_encoder: Don't shadow variables

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-09-02 14:35:17 +02:00
parent 2e574235b0
commit f1847dbc1f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/frame_thread_encoder.c
View File

@@ -200,14 +200,13 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx)
atomic_init(&c->exit, 0); atomic_init(&c->exit, 0);
c->max_tasks = avctx->thread_count + 2; c->max_tasks = avctx->thread_count + 2;
for (unsigned i = 0; i < c->max_tasks; i++) { for (unsigned j = 0; j < c->max_tasks; j++) {
if (!(c->tasks[i].indata = av_frame_alloc()) || if (!(c->tasks[j].indata = av_frame_alloc()) ||
!(c->tasks[i].outdata = av_packet_alloc())) !(c->tasks[j].outdata = av_packet_alloc()))
goto fail; goto fail;
} }
for(i=0; i<avctx->thread_count ; i++){ for(i=0; i<avctx->thread_count ; i++){
int ret;
void *tmpv; void *tmpv;
thread_avctx = avcodec_alloc_context3(avctx->codec); thread_avctx = avcodec_alloc_context3(avctx->codec);
if(!thread_avctx) if(!thread_avctx)
@@ -221,7 +220,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
if (avctx->codec->priv_class) { if (avctx->codec->priv_class) {
int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} }