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.
This commit is contained in:
Gwenole Beauchesne 2012-11-14 19:22:13 +01:00
parent 4d31e1e58a
commit 1e506ad6ee

View 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;
}