diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
| commit | 873a87c7e8f96e3f6785d90144182356b3fef7cd (patch) | |
| tree | 590281363041582f796770466b0f898e4e905fbd /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 1e9bc60777421b861852f9289d1ca71a69bedc3f (diff) | |
| parent | e428ea3e0055dd95445694a72ff5c6b491a46ec7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 60a1bdb0458..f745a840cea 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -158,7 +158,7 @@ static int write_audio_frame(FFMpegContext *context) for (channel = 0; channel < c->channels; channel++) { for (i = 0; i < frame->nb_samples; i++) { memcpy(context->audio_deinterleave_buffer + (i + channel * frame->nb_samples) * context->audio_sample_size, - context->audio_input_buffer + (c->channels * i + channel) * context->audio_sample_size, context->audio_sample_size); + context->audio_input_buffer + (c->channels * i + channel) * context->audio_sample_size, context->audio_sample_size); } } |