On Tue, Aug 02, 2016 at 10:18:31PM +0100, Mark Thompson wrote:
> ---
> Split from the conversion to follow, as suggested by Diego.
>
> libavcodec/vaapi_h264.c | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
> index 931357a..8769786 100644
> --- a/libavcodec/vaapi_h264.c
> +++ b/libavcodec/vaapi_h264.c
> @@ -226,12 +226,12 @@ static int vaapi_h264_start_frame(AVCodecContext
> *avctx,
> av_unused const uint8_t *buffer,
> av_unused uint32_t size)
> {
> - H264Context * const h = avctx->priv_data;
> - struct vaapi_context * const vactx = avctx->hwaccel_context;
> - const PPS *pps = h->ps.pps;
> - const SPS *sps = h->ps.sps;
> + struct vaapi_context *vactx = avctx->hwaccel_context;
> + const H264Context *h = avctx->priv_data;
> + const PPS *pps = h->ps.pps;
> + const SPS *sps = h->ps.sps;
> VAPictureParameterBufferH264 *pic_param;
> - VAIQMatrixBufferH264 *iq_matrix;
> + VAIQMatrixBufferH264 *iq_matrix;
>
> vactx->slice_param_size = sizeof(VASliceParameterBufferH264);
>
> @@ -292,9 +292,9 @@ static int vaapi_h264_start_frame(AVCodecContext
> *avctx,
> /** End a hardware decoding based frame. */
> static int vaapi_h264_end_frame(AVCodecContext *avctx)
> {
> - struct vaapi_context * const vactx = avctx->hwaccel_context;
> - H264Context * const h = avctx->priv_data;
> - H264SliceContext *sl = &h->slice_ctx[0];
> + struct vaapi_context *vactx = avctx->hwaccel_context;
> + const H264Context *h = avctx->priv_data;
> + H264SliceContext *sl = &h->slice_ctx[0];
> int ret;
>
> ret = ff_vaapi_commit_slices(vactx);
> @@ -317,8 +317,8 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
> const uint8_t *buffer,
> uint32_t size)
> {
> - H264Context * const h = avctx->priv_data;
> - H264SliceContext *sl = &h->slice_ctx[0];
> + const H264Context *h = avctx->priv_data;
> + const H264SliceContext *sl = &h->slice_ctx[0];
> VASliceParameterBufferH264 *slice_param;
IMO pointless cosmetics mixed in, aligning variable initializations that
are not related, i.e. struct members or similar, is pointless IMO.
Whatever; patch LGTM if it does not introduce new warnings.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
