diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-04-04 14:53:25 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-04-05 17:17:22 +0200 |
| commit | 0becb07842b57ea225ddf0726de33b5f8e669297 (patch) | |
| tree | ec7fe0533782cfbbd57d14e361039efa4e9c40e6 /libavcodec/h264.c | |
| parent | a03f8ea0a8c70b72acc9d8307f1bba0f35c1d36e (diff) | |
| download | ffmpeg-0becb07842b57ea225ddf0726de33b5f8e669297.tar.gz | |
h264: Factorize declaration of mb_sizes array.
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6a1a8b696d..890dd223f3 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -45,6 +45,8 @@ // #undef NDEBUG #include <assert.h> +const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 }; + static const uint8_t rem6[QP_MAX_NUM + 1] = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, @@ -2138,12 +2140,11 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple, if (!simple && IS_INTRA_PCM(mb_type)) { if (pixel_shift) { - static const uint16_t mb_sizes[4] = { 256, 384, 512, 768 }; const int bit_depth = h->sps.bit_depth_luma; int j; GetBitContext gb; init_get_bits(&gb, (uint8_t *)h->mb, - mb_sizes[h->sps.chroma_format_idc] * bit_depth); + ff_h264_mb_sizes[h->sps.chroma_format_idc] * bit_depth); for (i = 0; i < 16; i++) { uint16_t *tmp_y = (uint16_t *)(dest_y + i * linesize); |