MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/pnmdec, pnm_parser: Improve const-correctness

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-07-26 00:32:28 +02:00
parent d8388e1b4e
commit 22ca2ef018
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pnm.c
View File

@ -38,7 +38,7 @@ static void pnm_get(PNMContext *sc, char *str, int buf_size)
{
char *s;
int c;
uint8_t *bs = sc->bytestream;
const uint8_t *bs = sc->bytestream;
const uint8_t *end = sc->bytestream_end;
/* skip spaces and comments */

6
libavcodec/pnm.h
View File

@ -25,9 +25,9 @@
#include "avcodec.h"
typedef struct PNMContext {
uint8_t *bytestream;
uint8_t *bytestream_start;
uint8_t *bytestream_end;
const uint8_t *bytestream;
const uint8_t *bytestream_start;
const uint8_t *bytestream_end;
int maxval; ///< maximum value of a pixel
int type;
int endian;

8
libavcodec/pnm_parser.c
View File

@ -65,8 +65,8 @@ retry:
pnmctx.bytestream_end = pc->buffer + pc->index;
} else {
pnmctx.bytestream_start =
pnmctx.bytestream = (uint8_t *) buf + skip; /* casts avoid warnings */
pnmctx.bytestream_end = (uint8_t *) buf + buf_size - skip;
pnmctx.bytestream = buf + skip;
pnmctx.bytestream_end = buf + buf_size - skip;
}
if (ff_pnm_decode_header(avctx, &pnmctx) < 0) {
if (pnmctx.bytestream < pnmctx.bytestream_end) {
@ -81,9 +81,9 @@ retry:
goto retry;
}
} else if (pnmctx.type < 4) {
uint8_t *bs = pnmctx.bytestream;
const uint8_t *bs = pnmctx.bytestream;
const uint8_t *end = pnmctx.bytestream_end;
uint8_t *sync = bs;
const uint8_t *sync = bs;
if (pc->index) {
av_assert0(pnmpc->ascii_scan <= end - bs);

4
libavcodec/pnmdec.c
View File

@ -52,8 +52,8 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
float scale;
s->bytestream_start =
s->bytestream = (uint8_t *)buf;
s->bytestream_end = (uint8_t *)buf + buf_size;
s->bytestream = buf;
s->bytestream_end = buf + buf_size;
if ((ret = ff_pnm_decode_header(avctx, s)) < 0)
return ret;