diff options
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 11 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 18 |
3 files changed, 15 insertions, 16 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index ec22b8d8a2a..f5b3cab2024 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -787,8 +787,7 @@ static void ffmpeg_postprocess(struct anim *anim) int *dstStride = anim->pFrameRGB->linesize; uint8_t **dst = anim->pFrameRGB->data; int dstStride2[4] = { -dstStride[0], 0, 0, 0 }; - uint8_t *dst2[4] = { dst[0] + (anim->y - 1) * dstStride[0], - 0, 0, 0 }; + uint8_t *dst2[4] = { dst[0] + (anim->y - 1) * dstStride[0], 0, 0, 0 }; sws_scale(anim->img_convert_ctx, (const uint8_t *const *)input->data, @@ -885,13 +884,13 @@ static int ffmpeg_decode_video_frame(struct anim *anim) anim->pFrameComplete = 0; avcodec_decode_video2( - anim->pCodecCtx, - anim->pFrame, &anim->pFrameComplete, - &anim->next_packet); + anim->pCodecCtx, + anim->pFrame, &anim->pFrameComplete, + &anim->next_packet); if (anim->pFrameComplete) { anim->next_pts = av_get_pts_from_frame( - anim->pFormatCtx, anim->pFrame); + anim->pFormatCtx, anim->pFrame); av_log(anim->pFormatCtx, AV_LOG_DEBUG, diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index d9f1c92fdde..b3e08ba294b 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -183,7 +183,7 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t } else { if (verbose) printf("Cineon: Bad magic number %lu in \"%s\".\n", - (unsigned long)header.fileHeader.magic_num, byteStuff); + (unsigned long)header.fileHeader.magic_num, byteStuff); logImageClose(cineon); return NULL; } diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 5d88acd782a..6de3cabf5bd 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -879,11 +879,11 @@ static void index_rebuild_ffmpeg_proc_decoded_frame( tc_frameno = context->frameno_gapless; IMB_index_builder_proc_frame( - context->indexer[i], - curr_packet->data, - curr_packet->size, - tc_frameno, - s_pos, s_dts, pts); + context->indexer[i], + curr_packet->data, + curr_packet->size, + tc_frameno, + s_pos, s_dts, pts); } } @@ -937,7 +937,7 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context, if (frame_finished) { index_rebuild_ffmpeg_proc_decoded_frame( - context, &next_packet, in_frame); + context, &next_packet, in_frame); } av_free_packet(&next_packet); } @@ -957,12 +957,12 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context, frame_finished = 0; avcodec_decode_video2( - context->iCodecCtx, in_frame, &frame_finished, - &next_packet); + context->iCodecCtx, in_frame, &frame_finished, + &next_packet); if (frame_finished) { index_rebuild_ffmpeg_proc_decoded_frame( - context, &next_packet, in_frame); + context, &next_packet, in_frame); } } while (frame_finished); } |