summaryrefslogtreecommitdiff
path: root/libavcodec/h264dec.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-01-24 18:00:08 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-24 20:12:18 +0100
commit08437fc5b1daaad1249bf9e816f2d300fb407b70 (patch)
treee8641af98ecfb0371b3977a3345d41dda2fc548b /libavcodec/h264dec.h
parent8e208e0178bebb2403df6d2e1e0995fb0720f366 (diff)
lavc/h264: move some shared code from h264dec to h264_parse
Diffstat (limited to 'libavcodec/h264dec.h')
-rw-r--r--libavcodec/h264dec.h35
1 files changed, 0 insertions, 35 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 31d4da481f..5266420fa1 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -642,41 +642,6 @@ void ff_h264_filter_mb(const H264Context *h, H264SliceContext *sl, int mb_x, int
#define LUMA_DC_BLOCK_INDEX 48
#define CHROMA_DC_BLOCK_INDEX 49
-// This table must be here because scan8[constant] must be known at compiletime
-static const uint8_t scan8[16 * 3 + 3] = {
- 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8,
- 6 + 1 * 8, 7 + 1 * 8, 6 + 2 * 8, 7 + 2 * 8,
- 4 + 3 * 8, 5 + 3 * 8, 4 + 4 * 8, 5 + 4 * 8,
- 6 + 3 * 8, 7 + 3 * 8, 6 + 4 * 8, 7 + 4 * 8,
- 4 + 6 * 8, 5 + 6 * 8, 4 + 7 * 8, 5 + 7 * 8,
- 6 + 6 * 8, 7 + 6 * 8, 6 + 7 * 8, 7 + 7 * 8,
- 4 + 8 * 8, 5 + 8 * 8, 4 + 9 * 8, 5 + 9 * 8,
- 6 + 8 * 8, 7 + 8 * 8, 6 + 9 * 8, 7 + 9 * 8,
- 4 + 11 * 8, 5 + 11 * 8, 4 + 12 * 8, 5 + 12 * 8,
- 6 + 11 * 8, 7 + 11 * 8, 6 + 12 * 8, 7 + 12 * 8,
- 4 + 13 * 8, 5 + 13 * 8, 4 + 14 * 8, 5 + 14 * 8,
- 6 + 13 * 8, 7 + 13 * 8, 6 + 14 * 8, 7 + 14 * 8,
- 0 + 0 * 8, 0 + 5 * 8, 0 + 10 * 8
-};
-
-static av_always_inline uint32_t pack16to32(unsigned a, unsigned b)
-{
-#if HAVE_BIGENDIAN
- return (b & 0xFFFF) + (a << 16);
-#else
- return (a & 0xFFFF) + (b << 16);
-#endif
-}
-
-static av_always_inline uint16_t pack8to16(unsigned a, unsigned b)
-{
-#if HAVE_BIGENDIAN
- return (b & 0xFF) + (a << 8);
-#else
- return (a & 0xFF) + (b << 8);
-#endif
-}
-
/**
* Get the chroma qp.
*/