From f4d581cda3897f66c1dda7586b93f86a591dbbef Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 24 Mar 2016 11:16:53 +0100 Subject: lavc: Deduplicate zigzag_scan table --- libavcodec/h264_slice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/h264_slice.c') 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; -- cgit v1.2.3