ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> |
Tue Mar 4 17:18:30 2025 +0100| [60cae5019a536fe988e01ea3986f656d109c2e70] |
committer: Andreas Rheinhardt
avcodec/mjpegenc_common: Constify ff_mjpeg_encode_{dc,picture_header}()
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60cae5019a536fe988e01ea3986f656d109c2e70
---
libavcodec/mjpegenc_common.c | 16 ++++++++--------
libavcodec/mjpegenc_common.h | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 751e43fd3b..e7a4f8f16a 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -56,10 +56,10 @@ static int put_huffman_table(PutBitContext *p, int
table_class, int table_id,
}
static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p,
- MJpegContext *m,
+ const MJpegContext *m,
const uint8_t intra_matrix_permutation[64],
- uint16_t luma_intra_matrix[64],
- uint16_t chroma_intra_matrix[64],
+ const uint16_t luma_intra_matrix[64],
+ const uint16_t chroma_intra_matrix[64],
int hsample[3], int use_slices, int
matrices_differ)
{
int size;
@@ -246,7 +246,7 @@ static void jpeg_put_comments(AVCodecContext *avctx,
PutBitContext *p,
}
}
-void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int
vsample[4])
+void ff_mjpeg_init_hvsample(const AVCodecContext *avctx, int hsample[4], int
vsample[4])
{
if (avctx->codec_id == AV_CODEC_ID_LJPEG &&
( avctx->pix_fmt == AV_PIX_FMT_BGR0
@@ -273,10 +273,10 @@ void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int
hsample[4], int vsample[4
}
void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
- const AVFrame *frame, struct MJpegContext
*m,
+ const AVFrame *frame, const struct
MJpegContext *m,
const uint8_t
intra_matrix_permutation[64], int pred,
- uint16_t luma_intra_matrix[64],
- uint16_t chroma_intra_matrix[64],
+ const uint16_t luma_intra_matrix[64],
+ const uint16_t chroma_intra_matrix[64],
int use_slices)
{
const int lossless = !m;
@@ -465,7 +465,7 @@ void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int
header_bits)
}
void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
- uint8_t *huff_size, uint16_t *huff_code)
+ const uint8_t huff_size[], const uint16_t huff_code[])
{
int mant, nbits;
diff --git a/libavcodec/mjpegenc_common.h b/libavcodec/mjpegenc_common.h
index e9f0ea44a0..0cf5a72706 100644
--- a/libavcodec/mjpegenc_common.h
+++ b/libavcodec/mjpegenc_common.h
@@ -31,21 +31,21 @@ struct MJpegContext;
int ff_mjpeg_add_icc_profile_size(AVCodecContext *avctx, const AVFrame *frame,
size_t *max_pkt_size);
void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
- const AVFrame *frame, struct MJpegContext
*m,
+ const AVFrame *frame, const struct
MJpegContext *m,
const uint8_t intra_matrix_permutation[64],
int pred,
- uint16_t luma_intra_matrix[64],
- uint16_t chroma_intra_matrix[64],
+ const uint16_t luma_intra_matrix[64],
+ const uint16_t chroma_intra_matrix[64],
int use_slices);
void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
void ff_mjpeg_escape_FF(PutBitContext *pb, int start);
void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
const uint8_t *bits_table,
const uint8_t *val_table);
-void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int
vsample[4]);
+void ff_mjpeg_init_hvsample(const AVCodecContext *avctx, int hsample[4], int
vsample[4]);
void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
- uint8_t *huff_size, uint16_t *huff_code);
+ const uint8_t huff_size[], const uint16_t huff_code[]);
int ff_mjpeg_encode_check_pix_fmt(AVCodecContext *avctx);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
