diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-03-24 11:16:53 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-03-25 15:23:56 +0100 |
| commit | f4d581cda3897f66c1dda7586b93f86a591dbbef (patch) | |
| tree | 2b0ffc804d914fe27b7324f7e21487476df13bda /libavcodec/h264_ps.c | |
| parent | 02cd8bb9cb4381c50f42a9284098cc8a33d397db (diff) | |
lavc: Deduplicate zigzag_scan table
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 6b29966875..34a2954ca1 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -29,9 +29,9 @@ #include "libavutil/imgutils.h" #include "internal.h" +#include "mathops.h" #include "avcodec.h" #include "h264.h" -#include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan) #include "golomb.h" #define MAX_LOG2_MAX_FRAME_NUM (12 + 4) @@ -266,7 +266,7 @@ static void decode_scaling_list(H264Context *h, uint8_t *factors, int size, const uint8_t *fallback_list) { int i, last = 8, next = 8; - const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct; + const uint8_t *scan = size == 16 ? ff_zigzag_scan : ff_zigzag_direct; if (!get_bits1(&h->gb)) /* matrix not written, we use the predicted one */ memcpy(factors, fallback_list, size * sizeof(uint8_t)); else |