diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-06-01 18:37:09 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-06-01 18:37:09 +0400 |
| commit | 8937989a911fcc1bc634bbbb00be71fe62197fc4 (patch) | |
| tree | c1a1e62616ac2043cccd5813d78add387c5f0e3e /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | c0199e192dca28b4d08207dea51c86c3add72cd8 (diff) | |
== FFMPEG ==
Shouldn't crash any more in the case that
a) invalid video options were selected
and
b) audio multiplexing was active
[#13311] video_stream NULL when writing ffmpeg
(did'nt crash for me though, but added extra protection :) )
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 c95e3d20442..64af8258f80 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -867,7 +867,7 @@ void end_ffmpeg(void) fprintf(stderr, "Closing ffmpeg...\n"); - if (audio_stream) { + if (audio_stream && video_stream) { write_audio_frames(); } |