diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-15 08:34:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-15 08:34:14 +0400 |
commit | be71c46b24179ae1de3cecbca6b546a61888a581 (patch) | |
tree | 3e990785c5099cf2759bd66f7aa07a700e4fee4a /source/blender/imbuf/intern | |
parent | 8cca2fec82381144eebb6ab98fff17fc84452bce (diff) |
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index d1772229598..64e80d4383c 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -588,12 +588,12 @@ static int startffmpeg(struct anim *anim) avpicture_fill((AVPicture *) anim->pFrameDeinterlaced, MEM_callocN(avpicture_get_size( anim->pCodecCtx->pix_fmt, - anim->pCodecCtx->width, - anim->pCodecCtx->height), + anim->pCodecCtx->width, + anim->pCodecCtx->height), "ffmpeg deinterlace"), anim->pCodecCtx->pix_fmt, - anim->pCodecCtx->width, - anim->pCodecCtx->height); + anim->pCodecCtx->width, + anim->pCodecCtx->height); } if (pCodecCtx->has_b_frames) { diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 780ca7e5769..c66f2d62db2 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -810,7 +810,7 @@ static IndexBuildContext *index_ffmpeg_create_context(struct anim *anim, IMB_Tim anim, context->iStream, proxy_sizes[i], context->iCodecCtx->width * proxy_fac[i], av_get_cropped_height_from_codec( - context->iCodecCtx) * proxy_fac[i], + context->iCodecCtx) * proxy_fac[i], quality); if (!context->proxy_ctx[i]) { proxy_sizes_in_use &= ~proxy_sizes[i]; |