[libav-devel] [PATCH 2/6] vaapi_mpeg2: Constify pointers

[Mark Thompson]

---
The same as the previous patch, for MPEG-2.

 libavcodec/vaapi_mpeg2.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index cb77745..3ea868c 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -26,24 +26,26 @@
 #include "internal.h"

 /** Reconstruct bitstream f_code */
-static inline int mpeg2_get_f_code(MpegEncContext *s)
+static inline int mpeg2_get_f_code(const MpegEncContext *s)
 {
     return (s->mpeg_f_code[0][0] << 12) | (s->mpeg_f_code[0][1] << 8) |
            (s->mpeg_f_code[1][0] <<  4) |  s->mpeg_f_code[1][1];
 }

 /** Determine frame start: first field for field picture or frame picture */
-static inline int mpeg2_get_is_frame_start(MpegEncContext *s)
+static inline int mpeg2_get_is_frame_start(const MpegEncContext *s)
 {
     return s->first_field || s->picture_structure == PICT_FRAME;
 }

-static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const 
uint8_t *buffer, av_unused uint32_t size)
+static int vaapi_mpeg2_start_frame(AVCodecContext *avctx,
+                                   av_unused const uint8_t *buffer,
+                                   av_unused uint32_t size)
 {
-    struct MpegEncContext * const s = avctx->priv_data;
-    struct vaapi_context * const vactx = avctx->hwaccel_context;
+    const MpegEncContext *s = avctx->priv_data;
+    struct vaapi_context *vactx = avctx->hwaccel_context;
     VAPictureParameterBufferMPEG2 *pic_param;
-    VAIQMatrixBufferMPEG2 *iq_matrix;
+    VAIQMatrixBufferMPEG2         *iq_matrix;
     int i;

     vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
@@ -99,9 +101,11 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, 
av_unused const uint8_
     return 0;
 }

-static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t 
*buffer, uint32_t size)
+static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx,
+                                    const uint8_t *buffer,
+                                    uint32_t size)
 {
-    MpegEncContext * const s = avctx->priv_data;
+    const MpegEncContext *s = avctx->priv_data;
     VASliceParameterBufferMPEG2 *slice_param;
     GetBitContext gb;
     uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset;
-- 
2.8.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel