From a2fd547839d3ef8f342b6f2c096d0887675d3b1a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 11 Apr 2016 09:56:29 +0200 Subject: h264_refs: reorder functions to avoid forward declarations --- libavcodec/h264_refs.c | 69 ++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 08c3bffaf1..0a0cc8d709 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -169,8 +169,39 @@ static void h264_initialise_ref_list(H264Context *h, H264SliceContext *sl) } } -static void print_short_term(H264Context *h); -static void print_long_term(H264Context *h); +/** + * print short term list + */ +static void print_short_term(H264Context *h) +{ + uint32_t i; + if (h->avctx->debug & FF_DEBUG_MMCO) { + av_log(h->avctx, AV_LOG_DEBUG, "short term list:\n"); + for (i = 0; i < h->short_ref_count; i++) { + H264Picture *pic = h->short_ref[i]; + av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n", + i, pic->frame_num, pic->poc, pic->f->data[0]); + } + } +} + +/** + * print long term list + */ +static void print_long_term(H264Context *h) +{ + uint32_t i; + if (h->avctx->debug & FF_DEBUG_MMCO) { + av_log(h->avctx, AV_LOG_DEBUG, "long term list:\n"); + for (i = 0; i < 16; i++) { + H264Picture *pic = h->long_ref[i]; + if (pic) { + av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n", + i, pic->frame_num, pic->poc, pic->f->data[0]); + } + } + } +} /** * Extract structure information about the picture described by pic_num in @@ -475,40 +506,6 @@ void ff_h264_remove_all_refs(H264Context *h) h->short_ref_count = 0; } -/** - * print short term list - */ -static void print_short_term(H264Context *h) -{ - uint32_t i; - if (h->avctx->debug & FF_DEBUG_MMCO) { - av_log(h->avctx, AV_LOG_DEBUG, "short term list:\n"); - for (i = 0; i < h->short_ref_count; i++) { - H264Picture *pic = h->short_ref[i]; - av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n", - i, pic->frame_num, pic->poc, pic->f->data[0]); - } - } -} - -/** - * print long term list - */ -static void print_long_term(H264Context *h) -{ - uint32_t i; - if (h->avctx->debug & FF_DEBUG_MMCO) { - av_log(h->avctx, AV_LOG_DEBUG, "long term list:\n"); - for (i = 0; i < 16; i++) { - H264Picture *pic = h->long_ref[i]; - if (pic) { - av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n", - i, pic->frame_num, pic->poc, pic->f->data[0]); - } - } - } -} - static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos) { int i; -- cgit v1.2.3