summaryrefslogtreecommitdiff
path: root/src/libvdpau
diff options
context:
space:
mode:
authorJulian Scheel <julian@jusst.de>2009-01-15 13:07:06 +0000
committerJulian Scheel <julian@jusst.de>2009-01-15 13:07:06 +0000
commit1553b462393d3e20ed838d4326c9d62ca5317b1a (patch)
tree8b6bda8353579863c42150d278882e5a25d28e8e /src/libvdpau
parent1daabdb304c4d9d24b9b2937479ec3e929b9ded8 (diff)
downloadxine-lib-1553b462393d3e20ed838d4326c9d62ca5317b1a.tar.gz
xine-lib-1553b462393d3e20ed838d4326c9d62ca5317b1a.tar.bz2
Use sps->scaling_matrix instead of pps.
Diffstat (limited to 'src/libvdpau')
-rw-r--r--src/libvdpau/vdpau_h264.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libvdpau/vdpau_h264.c b/src/libvdpau/vdpau_h264.c
index 1124cfa31..e351ba8cc 100644
--- a/src/libvdpau/vdpau_h264.c
+++ b/src/libvdpau/vdpau_h264.c
@@ -262,8 +262,8 @@ static void fill_vdpau_pictureinfo_h264(video_decoder_t *this_gen, uint32_t slic
pic->pic_order_present_flag = pps->pic_order_present_flag;
pic->deblocking_filter_control_present_flag = pps->deblocking_filter_control_present_flag;
pic->redundant_pic_cnt_present_flag = pps->redundant_pic_cnt_present_flag;
- memcpy(pic->scaling_lists_4x4, pps->scaling_lists_4x4, sizeof(pic->scaling_lists_4x4));
- memcpy(pic->scaling_lists_8x8, pps->scaling_lists_8x8, sizeof(pic->scaling_lists_8x8));
+ memcpy(pic->scaling_lists_4x4, sps->scaling_lists_4x4, sizeof(pic->scaling_lists_4x4));
+ memcpy(pic->scaling_lists_8x8, sps->scaling_lists_8x8, sizeof(pic->scaling_lists_8x8));
/* set num_ref_frames to the number of actually available reference frames,
* if this is not set generation 3 decoders will fail. */
@@ -572,7 +572,10 @@ static void vdpau_h264_decode_data (video_decoder_t *this_gen,
parse_codec_private(this->nal_parser, codec_private, codec_private_len);
vdpau_decoder_init(this_gen);
}
- }
+ } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
+ printf("SPECIAL PALETTE is not yet handled\n");
+ } else
+ printf("UNKNOWN SPECIAL HEADER\n");
} else {
/* parse the first nal packages to retrieve profile type */