avcodec/dv: Don't pretend initializing work chunks can fail
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
f3c8d0399a
commit
2d33d6bfcc
@ -166,7 +166,7 @@ static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan,
|
||||
}
|
||||
}
|
||||
|
||||
int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d)
|
||||
void ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d)
|
||||
{
|
||||
int j, i, c, s, p;
|
||||
|
||||
@ -185,6 +185,4 @@ int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ typedef struct DVwork_chunk {
|
||||
uint16_t mb_coordinates[5];
|
||||
} DVwork_chunk;
|
||||
|
||||
int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d);
|
||||
void ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d);
|
||||
|
||||
static inline int dv_work_pool_size(const AVDVProfile *d)
|
||||
{
|
||||
|
@ -637,11 +637,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame,
|
||||
}
|
||||
|
||||
if (sys != s->sys) {
|
||||
ret = ff_dv_init_dynamic_tables(s->work_chunks, sys);
|
||||
if (ret < 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error initializing the work tables.\n");
|
||||
return ret;
|
||||
}
|
||||
ff_dv_init_dynamic_tables(s->work_chunks, sys);
|
||||
dv_init_weight_tables(s, sys);
|
||||
s->sys = sys;
|
||||
}
|
||||
|
@ -93,11 +93,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
ret = ff_dv_init_dynamic_tables(s->work_chunks, s->sys);
|
||||
if (ret < 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error initializing work tables.\n");
|
||||
return ret;
|
||||
}
|
||||
ff_dv_init_dynamic_tables(s->work_chunks, s->sys);
|
||||
|
||||
memset(&fdsp,0, sizeof(fdsp));
|
||||
memset(&mecc,0, sizeof(mecc));
|
||||
|
Loading…
Reference in New Issue
Block a user