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_slice.c | |
| parent | 02cd8bb9cb4381c50f42a9284098cc8a33d397db (diff) | |
| download | ffmpeg-f4d581cda3897f66c1dda7586b93f86a591dbbef.tar.gz | |
lavc: Deduplicate zigzag_scan table
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a94ff28f6d..b44aa3e3a4 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -790,7 +790,7 @@ static void init_scan_tables(H264Context *h) int i; for (i = 0; i < 16; i++) { #define TRANSPOSE(x) (x >> 2) | ((x << 2) & 0xF) - h->zigzag_scan[i] = TRANSPOSE(zigzag_scan[i]); + h->zigzag_scan[i] = TRANSPOSE(ff_zigzag_scan[i]); h->field_scan[i] = TRANSPOSE(field_scan[i]); #undef TRANSPOSE } @@ -803,7 +803,7 @@ static void init_scan_tables(H264Context *h) #undef TRANSPOSE } if (h->sps.transform_bypass) { // FIXME same ugly - h->zigzag_scan_q0 = zigzag_scan; + h->zigzag_scan_q0 = ff_zigzag_scan; h->zigzag_scan8x8_q0 = ff_zigzag_direct; h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc; h->field_scan_q0 = field_scan; |