summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCong Zhong <congx.zhong@intel.com>2013-04-17 10:44:48 +0800
committerTim-Philipp Müller <tim@centricular.com>2013-12-12 23:47:29 +0000
commit1055a58ddbbb04ac670bd26f68852b8e61b7c968 (patch)
treeaeea6cea09a6def48ecd2760bf0de6b4b4ef30d5
parent0fd23610d345b7018f5e80a8b1ab44af614df7a2 (diff)
downloadgstreamer-plugins-bad-1055a58ddbbb04ac670bd26f68852b8e61b7c968.tar.gz
codecparsers: h264: fix picture level scaling lists derivation (rule B).
Fix picture level scaling lists derivation from fall-back rule set B, as specified in 7.4.2.2. More precisely, the sequence level scaling lists need to be used but intra and inter lists arguments were swapped. This fixes FRExt/freh5.264 from conformance testing. https://bugzilla.gnome.org/show_bug.cgi?id=720099 Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r--gst-libs/gst/codecparsers/gsth264parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c
index 3173205c9..bd79a6faf 100644
--- a/gst-libs/gst/codecparsers/gsth264parser.c
+++ b/gst-libs/gst/codecparsers/gsth264parser.c
@@ -1721,8 +1721,8 @@ gst_h264_parse_pps (GstH264NalParser * nalparser, GstH264NalUnit * nalu,
if (sps->scaling_matrix_present_flag) {
if (!gst_h264_parser_parse_scaling_list (&nr,
pps->scaling_lists_4x4, pps->scaling_lists_8x8,
- sps->scaling_lists_4x4[0], sps->scaling_lists_4x4[3],
- sps->scaling_lists_8x8[0], sps->scaling_lists_8x8[3], n_lists))
+ sps->scaling_lists_4x4[3], sps->scaling_lists_4x4[0],
+ sps->scaling_lists_8x8[3], sps->scaling_lists_8x8[0], n_lists))
goto error;
} else {
if (!gst_h264_parser_parse_scaling_list (&nr,