From f0af25ae119d2aaa62d3add00d9051a133f7e71a Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 21 Aug 2015 18:14:12 -0700 Subject: ffv1: Add missing ff_ prefixes --- libavcodec/ffv1dec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libavcodec/ffv1dec.c') diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index f84a4fb50d..6c035b8eab 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -402,17 +402,17 @@ static int decode_slice(AVCodecContext *c, void *arg) fs->slice_rct_ry_coef = 1; if (f->version > 2) { - if (ffv1_init_slice_state(f, fs) < 0) + if (ff_ffv1_init_slice_state(f, fs) < 0) return AVERROR(ENOMEM); if (decode_slice_header(f, fs) < 0) { fs->slice_damaged = 1; return AVERROR_INVALIDDATA; } } - if ((ret = ffv1_init_slice_state(f, fs)) < 0) + if ((ret = ff_ffv1_init_slice_state(f, fs)) < 0) return ret; if (f->cur->key_frame || fs->slice_reset_contexts) - ffv1_clear_slice_state(f, fs); + ff_ffv1_clear_slice_state(f, fs); width = fs->slice_width; height = fs->slice_height; @@ -571,7 +571,7 @@ static int read_extra_header(FFV1Context *f) return AVERROR_INVALIDDATA; } } - if ((ret = ffv1_allocate_initial_states(f)) < 0) + if ((ret = ff_ffv1_allocate_initial_states(f)) < 0) return ret; for (i = 0; i < f->quant_table_count; i++) @@ -852,13 +852,13 @@ static av_cold int decode_init(AVCodecContext *avctx) FFV1Context *f = avctx->priv_data; int ret; - if ((ret = ffv1_common_init(avctx)) < 0) + if ((ret = ff_ffv1_common_init(avctx)) < 0) return ret; if (avctx->extradata && (ret = read_extra_header(f)) < 0) return ret; - if ((ret = ffv1_init_slice_contexts(f)) < 0) + if ((ret = ff_ffv1_init_slice_contexts(f)) < 0) return ret; avctx->internal->allocate_progress = 1; @@ -1021,7 +1021,7 @@ static int init_thread_copy(AVCodecContext *avctx) f->picture.f = av_frame_alloc(); f->last_picture.f = av_frame_alloc(); - if ((ret = ffv1_init_slice_contexts(f)) < 0) + if ((ret = ff_ffv1_init_slice_contexts(f)) < 0) return ret; return 0; @@ -1106,7 +1106,7 @@ AVCodec ff_ffv1_decoder = { .id = AV_CODEC_ID_FFV1, .priv_data_size = sizeof(FFV1Context), .init = decode_init, - .close = ffv1_close, + .close = ff_ffv1_close, .decode = decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), -- cgit v1.2.3