summaryrefslogtreecommitdiffstats
path: root/libavcodec/options.c
diff options
context:
space:
mode:
authorjamal <jamrial@gmail.com>2012-07-27 13:11:01 -0300
committerMichael Niedermayer <michaelni@gmx.at>2012-07-30 03:48:46 +0200
commit938e4470aeb94edb50d0999c81457132d0668603 (patch)
tree7221dfdcb40ebebec1c6c3811e7f25eb034647d3 /libavcodec/options.c
parent7d1918affee4bc70fb8ac139ba9235e7fed2979b (diff)
downloadffmpeg-streaming-938e4470aeb94edb50d0999c81457132d0668603.zip
ffmpeg-streaming-938e4470aeb94edb50d0999c81457132d0668603.tar.gz
options: Fix warning about incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r--libavcodec/options.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index c8f770a..5dfc9c8 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
OpenPOWER on IntegriCloud