Commit 4975390d authored by iive's avatar iive

silence warnings


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2843 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9ee4146d
...@@ -1292,7 +1292,7 @@ typedef struct AVCodecContext { ...@@ -1292,7 +1292,7 @@ typedef struct AVCodecContext {
* - encoding: unused * - encoding: unused
* - decoding: set by user, if not set then the native format will always be choosen * - 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 * DTG active format information (additionnal aspect ratio
......
...@@ -1306,7 +1306,7 @@ static int mpeg_decode_mb(MpegEncContext *s, ...@@ -1306,7 +1306,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
if (HAS_CBP(mb_type)) { if (HAS_CBP(mb_type)) {
cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); 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); av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
} }
......
...@@ -338,7 +338,7 @@ int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, v ...@@ -338,7 +338,7 @@ int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, v
return 0; 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]; return fmt[0];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment