wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/ffv1dec: move initial_states init to init_thread_copy()

Browse source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c72cca5a44)
This commit is contained in:
Michael Niedermayer 2013-09-01 19:29:38 +02:00 • committed by Carl Eugen Hoyos
parent 237ef710a1
commit 1da5ab751f
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libavcodec/ffv1dec.c
View file

@ -916,13 +916,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
static int init_thread_copy(AVCodecContext *avctx)
{
FFV1Context *f = avctx->priv_data;
int i;
f->picture.f = NULL;
f->last_picture.f = NULL;
f->sample_buffer = NULL;
f->quant_table_count = 0;
f->slice_count = 0;
for (i = 0; i < f->quant_table_count; i++) {
av_assert0(f->version > 1);
f->initial_states[i] = av_memdup(f->initial_states[i],
f->context_count[i] * sizeof(*f->initial_states[i]));
}
return 0;
}
@ -936,12 +942,9 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
return 0;
if (!fdst->picture.f) {
FFV1Context bak = *fdst;
memcpy(fdst, fsrc, sizeof(*fdst));
for (i = 0; i < fdst->quant_table_count; i++) {
fdst->initial_states[i] = av_malloc(fdst->context_count[i] * sizeof(*fdst->initial_states[i]));
memcpy(fdst->initial_states[i], fsrc->initial_states[i], fdst->context_count[i] * sizeof(*fdst->initial_states[i]));
}
memcpy(fdst->initial_states, bak.initial_states, sizeof(fdst->initial_states));
fdst->picture.f = av_frame_alloc();
fdst->last_picture.f = av_frame_alloc();