diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-02 14:35:17 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-04 08:03:33 +0200 |
| commit | f1847dbc1f117d12f32aaba26256cde139628864 (patch) | |
| tree | 305b3ad96857c6a9a06f4f23f82080f0a1c35324 | |
| parent | 2e574235b02ab33db67a12f0288b90ccbf256617 (diff) | |
| download | ffmpeg-f1847dbc1f117d12f32aaba26256cde139628864.tar.gz | |
avcodec/frame_thread_encoder: Don't shadow variables
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 8f8294374f..219d65cce7 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -200,14 +200,13 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) atomic_init(&c->exit, 0); c->max_tasks = avctx->thread_count + 2; - for (unsigned i = 0; i < c->max_tasks; i++) { - if (!(c->tasks[i].indata = av_frame_alloc()) || - !(c->tasks[i].outdata = av_packet_alloc())) + for (unsigned j = 0; j < c->max_tasks; j++) { + if (!(c->tasks[j].indata = av_frame_alloc()) || + !(c->tasks[j].outdata = av_packet_alloc())) goto fail; } for(i=0; i<avctx->thread_count ; i++){ - int ret; void *tmpv; thread_avctx = avcodec_alloc_context3(avctx->codec); if(!thread_avctx) @@ -221,7 +220,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) if (ret < 0) goto fail; 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) goto fail; } |