Merge remote branch 'internal/upstream' into HEAD

[platform/upstream/libvpx.git] / vp8 / common / alloccommon.c

diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index 1105a25..61c82e1 100644 (file)
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -126,7 +126,16 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height)
 }
 void vp8_setup_version(VP8_COMMON *cm)
 {
-    switch (cm->version)
+    if (cm->version & 0x4)
+    {
+        if (!CONFIG_EXPERIMENTAL)
+            vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
+                               "Bitstream was created by an experimental "
+                               "encoder");        
+        cm->experimental = 1;
+    }
+    
+    switch (cm->version & 0x3)
     {
     case 0:
         cm->no_lpf = 0;
@@ -152,13 +161,6 @@ void vp8_setup_version(VP8_COMMON *cm)
         cm->use_bilinear_mc_filter = 1;
         cm->full_pixel = 1;
         break;
-    default:
-        //4,5,6,7 are reserved for future use
-        cm->no_lpf = 0;
-        cm->simpler_lpf = 0;
-        cm->use_bilinear_mc_filter = 0;
-        cm->full_pixel = 0;
-        break;
     }
 }
 void vp8_create_common(VP8_COMMON *oci)