Browse Source

options: Fix warning about incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.0
jamal Michael Niedermayer 13 years ago
parent
commit
938e4470ae
2 changed files with 5 additions and 3 deletions
  1. +3
    -2
      libavcodec/options.c
  2. +2
    -1
      libavformat/options.c

+ 3
- 2
libavcodec/options.c View File

@@ -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


+ 2
- 1
libavformat/options.c View File

@@ -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;
}


Loading…
Cancel
Save