From 938e4470aeb94edb50d0999c81457132d0668603 Mon Sep 17 00:00:00 2001 From: jamal Date: Fri, 27 Jul 2012 13:11:01 -0300 Subject: [PATCH] options: Fix warning about incompatible pointer type Signed-off-by: Michael Niedermayer --- libavcodec/options.c | 5 +++-- libavformat/options.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index c8f770a7c8..5dfc9c8241 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -65,8 +65,9 @@ static const AVClass *codec_child_class_next(const AVClass *prev) 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; else return AV_CLASS_CATEGORY_ENCODER; } @@ -80,7 +81,7 @@ static const AVClass av_codec_context_class = { .child_next = codec_child_next, .child_class_next = codec_child_class_next, .category = AV_CLASS_CATEGORY_ENCODER, - .get_category = (void*)get_category, + .get_category = get_category, }; #if FF_API_ALLOC_CONTEXT diff --git a/libavformat/options.c b/libavformat/options.c index 8548381a24..42307d170f 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -76,8 +76,9 @@ static const AVClass *format_child_class_next(const AVClass *prev) 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; else return AV_CLASS_CATEGORY_MUXER; }