Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> ---
> libavcodec/dv.c | 4 +---
> libavcodec/dv_internal.h | 2 +-
> libavcodec/dvdec.c | 6 +-----
> libavcodec/dvenc.c | 6 +-----
> 4 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/libavcodec/dv.c b/libavcodec/dv.c
> index eb49978ad8..194d982562 100644
> --- a/libavcodec/dv.c
> +++ b/libavcodec/dv.c
> @@ -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;
> }
> diff --git a/libavcodec/dv_internal.h b/libavcodec/dv_internal.h
> index 4b4151c88d..05e26a8138 100644
> --- a/libavcodec/dv_internal.h
> +++ b/libavcodec/dv_internal.h
> @@ -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)
> {
> diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
> index a06e4807e7..9e8d40187d 100644
> --- a/libavcodec/dvdec.c
> +++ b/libavcodec/dvdec.c
> @@ -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;
> }
> diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
> index ce21247081..3afeedbb87 100644
> --- a/libavcodec/dvenc.c
> +++ b/libavcodec/dvenc.c
> @@ -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));
Sorry, sent the wrong patches. Ignore v1 of #8 and #9.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
