summaryrefslogtreecommitdiff
path: root/libavcodec/dnxhddata.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-07-25 12:09:22 -0300
committerJames Almer <jamrial@gmail.com>2016-07-25 12:19:39 -0300
commit0c75bd8e3cd7f92a65878fc643d17d7826ecc561 (patch)
treebf32ed54b7b8f109d62dcddf6d24c6bcda18619d /libavcodec/dnxhddata.c
parent26cb7232c3432faa7a83d52dbff4503530f833ab (diff)
avcodec/dnxhddata: move avpriv_dnxhd_parse_header_prefix to a header
It's a small and simple function that can be inlined. This removes one private symbol and should reduce object dependencies with the next major bump Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dnxhddata.c')
-rw-r--r--libavcodec/dnxhddata.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index 480b8069cf..2011829a06 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -22,7 +22,6 @@
#include "avcodec.h"
#include "dnxhddata.h"
#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
/* The quantization tables below are in zigzag order! */
@@ -1103,12 +1102,12 @@ int avpriv_dnxhd_get_interlaced(int cid)
return ff_dnxhd_cid_table[i].flags & DNXHD_INTERLACED ? 1 : 0;
}
+#if LIBAVCODEC_VERSION_MAJOR < 58
uint64_t avpriv_dnxhd_parse_header_prefix(const uint8_t *buf)
{
- uint64_t prefix = AV_RB32(buf);
- prefix = (prefix << 16) | buf[4] << 8;
- return ff_dnxhd_check_header_prefix(prefix);
+ return ff_dnxhd_parse_header_prefix(buf);
}
+#endif
static int dnxhd_find_hr_cid(AVCodecContext *avctx)
{