Commit 494c56d3 authored by Ivan Kalvachev's avatar Ivan Kalvachev

silence warnings

Originally committed as revision 2843 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 399cec2f
......@@ -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
......
......@@ -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;
}
......
......@@ -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];
}
......
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