From 1e506ad6eec8d1599353545c644a78b247cc164e Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Wed, 14 Nov 2012 19:22:13 +0100 Subject: [PATCH] h264: fix incorrect integration of previous commit (4d31e1e). git am got confused somehow, though the end result doesn't change at all since we require both SPS and PPS to be parsed prior to decoding the first slice. --- gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c index 6a0e07e6d4..dbe8eb44b7 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c @@ -1170,7 +1170,7 @@ decode_sps(GstVaapiDecoderH264 *decoder, GstH264NalUnit *nalu) if (result != GST_H264_PARSER_OK) return get_status(result); - priv->got_pps = TRUE; + priv->got_sps = TRUE; return GST_VAAPI_DECODER_STATUS_SUCCESS; } @@ -1188,7 +1188,7 @@ decode_pps(GstVaapiDecoderH264 *decoder, GstH264NalUnit *nalu) if (result != GST_H264_PARSER_OK) return get_status(result); - priv->got_sps = TRUE; + priv->got_pps = TRUE; return GST_VAAPI_DECODER_STATUS_SUCCESS; }