From 7278d78bec83b978c38a3abffcafd0a866723cb1 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 6 Sep 2014 12:39:03 +0200 Subject: avcodec: use codecid with AV_ prefix - use enum AVCodecID instead of enum CodecID - use AV_CODEC_ID_xxx instead of CODEC_ID_xxx - extend a backwards compatible macro-wrapper in avcodec.h avcodec should still compile on old versions of FFmpeg. please let us know if it does not :) --- modules/avcodec/decode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/avcodec/decode.c') diff --git a/modules/avcodec/decode.c b/modules/avcodec/decode.c index 36550a7..289d5a8 100644 --- a/modules/avcodec/decode.c +++ b/modules/avcodec/decode.c @@ -40,10 +40,10 @@ static void destructor(void *arg) static int init_decoder(struct viddec_state *st, const char *name) { - enum CodecID codec_id; + enum AVCodecID codec_id; codec_id = avcodec_resolve_codecid(name); - if (codec_id == CODEC_ID_NONE) + if (codec_id == AV_CODEC_ID_NONE) return EINVAL; st->codec = avcodec_find_decoder(codec_id); -- cgit v1.2.3