xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-21 12:40:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

options: Fix warning about incompatible pointer type

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
jamal 2012-07-27 13:11:01 -03:00 committed by Michael Niedermayer
parent 7d1918affe
commit 938e4470ae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/options.c
View File

@ -65,8 +65,9 @@ static const AVClass *codec_child_class_next(const AVClass *prev)
return NULL; return NULL;
} }
static AVClassCategory get_category(AVCodecContext *avctx) static AVClassCategory get_category(void *ptr)
{ {
AVCodecContext* avctx = ptr;
if(avctx->codec && avctx->codec->decode) return AV_CLASS_CATEGORY_DECODER; if(avctx->codec && avctx->codec->decode) return AV_CLASS_CATEGORY_DECODER;
else return AV_CLASS_CATEGORY_ENCODER; else return AV_CLASS_CATEGORY_ENCODER;
} }
@ -80,7 +81,7 @@ static const AVClass av_codec_context_class = {
.child_next = codec_child_next, .child_next = codec_child_next,
.child_class_next = codec_child_class_next, .child_class_next = codec_child_class_next,
.category = AV_CLASS_CATEGORY_ENCODER, .category = AV_CLASS_CATEGORY_ENCODER,
.get_category = (void*)get_category, .get_category = get_category,
}; };
#if FF_API_ALLOC_CONTEXT #if FF_API_ALLOC_CONTEXT

3
libavformat/options.c
View File

@ -76,8 +76,9 @@ static const AVClass *format_child_class_next(const AVClass *prev)
return NULL; return NULL;
} }
static AVClassCategory get_category(AVFormatContext *s) static AVClassCategory get_category(void *ptr)
{ {
AVFormatContext* s = ptr;
if(s->iformat) return AV_CLASS_CATEGORY_DEMUXER; if(s->iformat) return AV_CLASS_CATEGORY_DEMUXER;
else return AV_CLASS_CATEGORY_MUXER; else return AV_CLASS_CATEGORY_MUXER;
} }