diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-24 20:55:07 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-26 15:23:08 +0100 |
| commit | 0ebfd6485841e3b1e73b794065e05c2c0b36e984 (patch) | |
| tree | 1af9697094d265346fe4b65f60fb48cafe534f29 | |
| parent | b531b58b2c9f684ad9408f878453e10908ca94de (diff) | |
avcodec/h264dec: Move pack8to16 to its only user
Namely to h264_cabac.c.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/h264_cabac.c | 9 | ||||
| -rw-r--r-- | libavcodec/h264dec.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 040fa0a257..884d392022 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1281,6 +1281,15 @@ void ff_h264_init_cabac_states(const H264Context *h, H264SliceContext *sl) } } +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 +} + static int decode_cabac_field_decoding_flag(const H264Context *h, H264SliceContext *sl) { const int mbb_xy = sl->mb_xy - 2*h->mb_stride; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 1128dddfd1..dffd723ba6 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -685,15 +685,6 @@ static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) #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. */ |