diff options
| author | jamal <jamrial@gmail.com> | 2012-07-27 13:11:01 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 03:48:46 +0200 |
| commit | 938e4470aeb94edb50d0999c81457132d0668603 (patch) | |
| tree | 7221dfdcb40ebebec1c6c3811e7f25eb034647d3 | |
| parent | 7d1918affee4bc70fb8ac139ba9235e7fed2979b (diff) | |
| download | ffmpeg-938e4470aeb94edb50d0999c81457132d0668603.tar.gz | |
options: Fix warning about incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/options.c | 5 | ||||
| -rw-r--r-- | 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; } |