[vlc-commits] videotoolbox: add missing sanity check

Felix Paul Kühne git at videolan.org
Tue Sep 8 16:55:35 CEST 2015


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Sep  8 16:54:58 2015 +0200| [fe84f6ec252b54630eca97c94c94218a5665f582] | committer: Felix Paul Kühne

videotoolbox: add missing sanity check

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe84f6ec252b54630eca97c94c94218a5665f582
---

 modules/codec/videotoolbox.m |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index c9b15d2..8bfa88d 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -448,12 +448,14 @@ static int StartVideoToolbox(decoder_t *p_dec, block_t *p_block)
 
     p_sys->b_enable_temporal_processing = false;
     if (var_InheritInteger(p_dec, "videotoolbox-temporal-deinterlacing")) {
-        if (p_block->i_flags & BLOCK_FLAG_TOP_FIELD_FIRST ||
-            p_block->i_flags & BLOCK_FLAG_BOTTOM_FIELD_FIRST) {
-            msg_Dbg(p_dec, "Interlaced content detected, inserting temporal deinterlacer");
-            CFDictionarySetValue(decoderConfiguration, kVTDecompressionPropertyKey_FieldMode, kVTDecompressionProperty_FieldMode_DeinterlaceFields);
-            CFDictionarySetValue(decoderConfiguration, kVTDecompressionPropertyKey_DeinterlaceMode, kVTDecompressionProperty_DeinterlaceMode_Temporal);
-            p_sys->b_enable_temporal_processing = true;
+        if (p_block != NULL) {
+            if (p_block->i_flags & BLOCK_FLAG_TOP_FIELD_FIRST ||
+                p_block->i_flags & BLOCK_FLAG_BOTTOM_FIELD_FIRST) {
+                msg_Dbg(p_dec, "Interlaced content detected, inserting temporal deinterlacer");
+                CFDictionarySetValue(decoderConfiguration, kVTDecompressionPropertyKey_FieldMode, kVTDecompressionProperty_FieldMode_DeinterlaceFields);
+                CFDictionarySetValue(decoderConfiguration, kVTDecompressionPropertyKey_DeinterlaceMode, kVTDecompressionProperty_DeinterlaceMode_Temporal);
+                p_sys->b_enable_temporal_processing = true;
+            }
         }
     }
 



More information about the vlc-commits mailing list