mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a'
* commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a': h264_refs: reorder functions to avoid forward declarations Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
902862bb4b
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue