h264: fix incorrect integration of previous commit (4d31e1e).
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Wed, 14 Nov 2012 18:22:13 +0000 (19:22 +0100)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Wed, 14 Nov 2012 18:23:32 +0000 (19:23 +0100)
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

index 6a0e07e6d479d3b0a70b482b19276229aa0251d8..dbe8eb44b7fd97f005116ba207e354a49eb022a4 100644 (file)
@@ -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;
 }