diff mbox series

[FFmpeg-devel,14/17] avcodec/dnxhddata: Unavpriv dnxhd_get_(hr_|)_frame_size()

Message ID AM7PR03MB6660F32620242BBC50C4C2648F929@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 17c8533745305bdf9c26c87dcbc43453ed6f0804
Headers show
Series [FFmpeg-devel,01/17] avformat/mxfenc: Auto-insert h264_mp4toannexb BSF if needed | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Nov. 9, 2021, 6:01 p.m. UTC 
It is no longer used in libavformat.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/dnxhd_parser.c | 4 ++--
 libavcodec/dnxhddata.c    | 4 ++--
 libavcodec/dnxhddata.h    | 4 ++--
 libavcodec/dnxhdenc.c     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c
index 4ba619c9bb..631ac83860 100644
--- a/libavcodec/dnxhd_parser.c
+++ b/libavcodec/dnxhd_parser.c
@@ -73,9 +73,9 @@  static int dnxhd_find_frame_end(DNXHDParserContext *dctx,
                 if (cid <= 0)
                     continue;
 
-                remaining = avpriv_dnxhd_get_frame_size(cid);
+                remaining = ff_dnxhd_get_frame_size(cid);
                 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)
                         continue;
                 }
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index e3b260f328..cb3d4a4c72 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -1083,7 +1083,7 @@  const CIDEntry *ff_dnxhd_get_cid_table(int cid)
     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);
     if (!entry)
@@ -1091,7 +1091,7 @@  int avpriv_dnxhd_get_frame_size(int cid)
     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);
     int result;
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index ecb1cd0b2d..861faca4ca 100644
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -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);
 }
 
-int avpriv_dnxhd_get_frame_size(int cid);
-int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h);
+int ff_dnxhd_get_frame_size(int cid);
+int ff_dnxhd_get_hr_frame_size(int cid, int w, int h);
 
 #endif /* AVCODEC_DNXHDDATA_H */
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index ebfb85341d..ca67964330 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -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;
 
     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);
         av_assert0(ctx->frame_size >= 0);
         ctx->coding_unit_size = ctx->frame_size;