diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-01-16 18:40:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-28 12:00:31 +0400 |
| commit | 8c3b27ce279f1f0904af3c220d92acfa1f20a70e (patch) | |
| tree | 077e32b67a7bbc644e979102eb455aeb0ed75cdd /source/blender/imbuf | |
| parent | 6fe5b3be38af229640d1926bd908361d5e7a2b15 (diff) | |
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
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/indexer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |