@@ -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 */
@@ -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;
@@ -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);
@@ -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;
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/pnm.c | 2 +- libavcodec/pnm.h | 6 +++--- libavcodec/pnm_parser.c | 8 ++++---- libavcodec/pnmdec.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)