diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:47:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:47:39 +0100 |
| commit | a5a6621616aac55b8284002af4fef35b66e2b2d1 (patch) | |
| tree | e162517aeeef766d788a645d362e089221681234 /libavcodec/h264_ps.c | |
| parent | 2e67a99fbc6b99315925de40fc6fa7161576be10 (diff) | |
| parent | f4d581cda3897f66c1dda7586b93f86a591dbbef (diff) | |
Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 0bca9c1a80..515eb8a760 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -29,6 +29,7 @@ #include "libavutil/imgutils.h" #include "internal.h" +#include "mathops.h" #include "avcodec.h" #include "h264.h" #include "h264data.h" @@ -272,7 +273,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 |