mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-08 19:07:09 +00:00
silence warnings
Originally committed as revision 2843 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
399cec2f3e
commit
494c56d36f
@ -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,
|
|||||||
|
|
||||||
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
|
|||||||
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];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user