From 8c3b27ce279f1f0904af3c220d92acfa1f20a70e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 16 Jan 2014 15:40:37 +0100 Subject: Change libavcodec CODEC_ID_* to AV_CODEC_ID_* CODEC_ID_* have been replaced with AV_CODEC_ID_* in new libavcodec versions. Update the code to use those new identifiers. Added a compatibility code to ffmpeg_compat.h --- source/blender/imbuf/intern/indexer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/imbuf/intern/indexer.c') diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 49a40c461ac..74f39d544cc 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -504,7 +504,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( rv->c = rv->st->codec; rv->c->codec_type = AVMEDIA_TYPE_VIDEO; - rv->c->codec_id = CODEC_ID_MJPEG; + rv->c->codec_id = AV_CODEC_ID_MJPEG; rv->c->width = width; rv->c->height = height; -- cgit v1.2.3