summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorSreerenj Balachandran <sreerenj.balachandran@intel.com>2013-08-20 17:03:38 +0300
committerSebastian Dröge <slomo@circular-chaos.org>2013-10-02 10:59:10 +0200
commite943f56bf8c8ef14bcac8e98510f323acf96475a (patch)
tree4b0e0cfd0e608fb68a93b0345ee3dedf3ec5b749 /gst-libs
parent7622c9b10aef79a378d24ae38872333a56109eec (diff)
downloadgstreamer-plugins-bad-e943f56bf8c8ef14bcac8e98510f323acf96475a.tar.gz
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
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/codecparsers/gsth264parser.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c
index 0020f4015..efbdf3002 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