diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-23 12:38:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-23 12:38:38 +0400 |
| commit | eaaeae469968c5c78a5d7e6d202f1af00b382a79 (patch) | |
| tree | 259673f3c807361df29f16d6325a2bf659c06b52 /intern | |
| parent | 88fe8962434b7fe00fa713a84c58d2dbee481e3b (diff) | |
Cleanup: spelling
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_volume.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp index d30835da4e5..4ee99c723aa 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp @@ -170,7 +170,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, AUD_THROW(AUD_ERROR_FFMPEG, codec_error); if(codec->sample_fmts) { - // Check if the prefered sample format for this codec is supported. + // Check if the preferred sample format for this codec is supported. const enum AVSampleFormat *p = codec->sample_fmts; for(; *p != -1; p++) { if(*p == m_stream->codec->sample_fmt) diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h index 93cb4c120ea..ce20f20e75a 100644 --- a/intern/cycles/kernel/kernel_volume.h +++ b/intern/cycles/kernel/kernel_volume.h @@ -958,7 +958,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg, Ray *ray, VolumeStack *stack) { - /* NULL ray happens in the baker, does it need proper initializetion of + /* NULL ray happens in the baker, does it need proper initialization of * camera in volume? */ if(!kernel_data.cam.is_inside_volume || ray == NULL) { |