virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

avcodec/h264dec: Move pack8to16 to its only user

Browse Source 
Namely to h264_cabac.c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-01-24 20:55:07 +01:00
parent b531b58b2c
commit 0ebfd64858
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264_cabac.c
View File

@ -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) static int decode_cabac_field_decoding_flag(const H264Context *h, H264SliceContext *sl)
{ {
const int mbb_xy = sl->mb_xy - 2*h->mb_stride; const int mbb_xy = sl->mb_xy - 2*h->mb_stride;

9
libavcodec/h264dec.h
View File

@ -685,15 +685,6 @@ static av_always_inline uint32_t pack16to32(unsigned a, unsigned b)
#endif #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. * Get the chroma qp.
*/ */