diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-11 18:46:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-11 18:46:41 +0400 |
| commit | 716459689100cf9f8399832153fae4c2e2b23fa1 (patch) | |
| tree | 33ebe22e9beb8a852e2c576156048f973148cc3b /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 07580e71a6153641f8ecd25fbd1dd35fa23421b3 (diff) | |
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.
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 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"); |