[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55969] trunk/blender/source/blender/ blenkernel/intern/writeffmpeg.c: Fix #34956: rendering animation with audio would crash with an older ffmpeg

[Brecht Van Lommel]

Revision: 55969
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55969
Author:   blendix
Date:     2013-04-11 14:46:41 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-04-11 14:15:52 UTC (rev 55968)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-04-11 14:46:41 UTC (rev 55969)
@@ -159,7 +159,7 @@
 	}
 
 	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");