har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/dnxhddata: Unavpriv dnxhd_get_(hr_|)_frame_size()

Browse Source 
It is no longer used in libavformat.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-11-09 15:35:22 +01:00
parent b9a26b9d55
commit 17c8533745
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dnxhd_parser.c
View File

@ -73,9 +73,9 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx,
if (cid <= 0) if (cid <= 0)
continue; continue;
remaining = avpriv_dnxhd_get_frame_size(cid); remaining = ff_dnxhd_get_frame_size(cid);
if (remaining <= 0) { if (remaining <= 0) {
remaining = avpriv_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); remaining = ff_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h);
if (remaining <= 0) if (remaining <= 0)
continue; continue;
} }

4
libavcodec/dnxhddata.c
View File

@ -1083,7 +1083,7 @@ const CIDEntry *ff_dnxhd_get_cid_table(int cid)
return NULL; return NULL;
} }
int avpriv_dnxhd_get_frame_size(int cid) int ff_dnxhd_get_frame_size(int cid)
{ {
const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); const CIDEntry *entry = ff_dnxhd_get_cid_table(cid);
if (!entry) if (!entry)
@ -1091,7 +1091,7 @@ int avpriv_dnxhd_get_frame_size(int cid)
return entry->frame_size; return entry->frame_size;
} }
int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h) int ff_dnxhd_get_hr_frame_size(int cid, int w, int h)
{ {
const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); const CIDEntry *entry = ff_dnxhd_get_cid_table(cid);
int result; int result;

4
libavcodec/dnxhddata.h
View File

@ -88,7 +88,7 @@ static av_always_inline uint64_t ff_dnxhd_parse_header_prefix(const uint8_t *buf
return ff_dnxhd_check_header_prefix(prefix); return ff_dnxhd_check_header_prefix(prefix);
} }
int avpriv_dnxhd_get_frame_size(int cid); int ff_dnxhd_get_frame_size(int cid);
int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h); int ff_dnxhd_get_hr_frame_size(int cid, int w, int h);
#endif /* AVCODEC_DNXHDDATA_H */ #endif /* AVCODEC_DNXHDDATA_H */

2
libavcodec/dnxhdenc.c
View File

@ -463,7 +463,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
ctx->m.mb_num = ctx->m.mb_height * ctx->m.mb_width; ctx->m.mb_num = ctx->m.mb_height * ctx->m.mb_width;
if (ctx->cid_table->frame_size == DNXHD_VARIABLE) { if (ctx->cid_table->frame_size == DNXHD_VARIABLE) {
ctx->frame_size = avpriv_dnxhd_get_hr_frame_size(ctx->cid, ctx->frame_size = ff_dnxhd_get_hr_frame_size(ctx->cid,
avctx->width, avctx->height); avctx->width, avctx->height);
av_assert0(ctx->frame_size >= 0); av_assert0(ctx->frame_size >= 0);
ctx->coding_unit_size = ctx->frame_size; ctx->coding_unit_size = ctx->frame_size;