From e943f56bf8c8ef14bcac8e98510f323acf96475a Mon Sep 17 00:00:00 2001 From: Sreerenj Balachandran Date: Tue, 20 Aug 2013 17:03:38 +0300 Subject: [PATCH] codecparsers: h264: store quantization matrices in zig-zag order Quantizer matrices are encoded in zigzag scan order in the bitstream, so always parse it as it is. https://bugzilla.gnome.org/show_bug.cgi?id=708629 --- gst-libs/gst/codecparsers/gsth264parser.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c index 0020f4015b..efbdf30027 100644 --- a/gst-libs/gst/codecparsers/gsth264parser.c +++ b/gst-libs/gst/codecparsers/gsth264parser.c @@ -696,18 +696,15 @@ gst_h264_parser_parse_scaling_list (NalReader * nr, READ_UINT8 (nr, scaling_list_present_flag, 1); if (scaling_list_present_flag) { guint8 *scaling_list; - const guint8 *scan; guint size; guint j; guint8 last_scale, next_scale; if (i < 6) { scaling_list = scaling_lists_4x4[i]; - scan = zigzag_4x4; size = 16; } else { scaling_list = scaling_lists_8x8[i - 6]; - scan = zigzag_8x8; size = 64; } @@ -724,7 +721,7 @@ gst_h264_parser_parse_scaling_list (NalReader * nr, use_default = TRUE; break; } - last_scale = scaling_list[scan[j]] = + last_scale = scaling_list[j] = (next_scale == 0) ? last_scale : next_scale; } } else