From 716459689100cf9f8399832153fae4c2e2b23fa1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 11 Apr 2013 14:46:41 +0000 Subject: Fix #34956: rendering animation with audio would crash with an older ffmpeg after recent changes. New ffmpeg versions accept align = 0 as a parameter and will set it to 1 automatically, but older ones need to pass align = 1. --- source/blender/blenkernel/intern/writeffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/writeffmpeg.c') diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 3249de49fe6..404be7d6857 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -159,7 +159,7 @@ static int write_audio_frame(void) } avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt, audio_input_buffer, - audio_input_samples * c->channels * audio_sample_size, 0); + audio_input_samples * c->channels * audio_sample_size, 1); if (avcodec_encode_audio2(c, &pkt, frame, &got_output) < 0) { // XXX error("Error writing audio packet"); -- cgit v1.2.3