diff options
author | Clément Bœsch <u@pkh.me> | 2016-06-19 14:03:31 +0300 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-06-19 14:04:17 +0300 |
commit | 902862bb4be4492c040b7e3b6d657ebb4b36bbc7 (patch) | |
tree | 6dae30d2f19f21442f83b798b49338085f1b5eb4 /libavcodec/h264_refs.c | |
parent | 98456d4d69e0fdcc328bb9e684ae776f5bc824e1 (diff) | |
parent | a2fd547839d3ef8f342b6f2c096d0887675d3b1a (diff) |
Merge commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a'
* commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a':
h264_refs: reorder functions to avoid forward declarations
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264_refs.c')
-rw-r--r-- | libavcodec/h264_refs.c | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 2b90168ab1..d00ceb8bc6 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -212,8 +212,39 @@ static void h264_initialise_ref_list(H264Context *h, H264SliceContext *sl) h->default_ref[i] = sl->ref_list[i][0]; } -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 @@ -537,40 +568,6 @@ void ff_h264_remove_all_refs(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]); - } - } - } -} - static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos) { int i; |