From 494c56d36fd2556175550a951857793ced4970ac Mon Sep 17 00:00:00 2001 From: Ivan Kalvachev Date: Thu, 4 Mar 2004 14:58:48 +0000 Subject: [PATCH] silence warnings Originally committed as revision 2843 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 2 +- libavcodec/mpeg12.c | 2 +- libavcodec/utils.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5b38c09b3d..ba9f4d074f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1292,7 +1292,7 @@ typedef struct AVCodecContext { * - encoding: unused * - decoding: set by user, if not set then the native format will always be choosen */ - enum PixelFormat (*get_format)(struct AVCodecContext *s, enum PixelFormat * fmt); + enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt); /** * DTG active format information (additionnal aspect ratio diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 60241ec155..07fddd568b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1306,7 +1306,7 @@ static int mpeg_decode_mb(MpegEncContext *s, if (HAS_CBP(mb_type)) { cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); - if (cbp < 0 || (cbp == 0) && (s->chroma_format < 2) ){ + if (cbp < 0 || ((cbp == 0) && (s->chroma_format < 2)) ){ av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); return -1; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a6fd4c7138..b6b6059e99 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -338,7 +338,7 @@ int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, v return 0; } -enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, enum PixelFormat * fmt){ +enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt){ return fmt[0]; }