libvideocodec: resolve compilation errors when building for 54xx

Change-Id: Id518b48b008f9dcf6e3e166ffcf67e2daedecf61

diff --git a/libvideocodec/Android.mk b/libvideocodec/Android.mk
index 32765d5c398dc18539c6662c5e81898f26c92eb1..741067d3431e98e1e93cc56cfb7098ae79ddb42e 100644 (file)
--- a/libvideocodec/Android.mk
+++ b/libvideocodec/Android.mk
@@ -28,7 +28,9 @@ endif
 
 # since 3.10 kernel
 ifneq ($(filter-out 3.4, $(TARGET_LINUX_KERNEL_VERSION)),)
+ifneq ($(TARGET_SOC), exynos5433)
 LOCAL_CFLAGS += -DCID_SUPPORT
+endif
 LOCAL_CFLAGS += -DUSE_DEFINE_H264_SEI_TYPE
 LOCAL_CFLAGS += -DUSE_ORIGINAL_HEADER
 endif

diff --git a/libvideocodec/dec/ExynosVideoDecoder.c b/libvideocodec/dec/ExynosVideoDecoder.c
index 6d7bff7000525a8bcf66d978e09c68cec07525d6..d0ae6d29df19325a1cf314258d190048218a1b3f 100644 (file)
--- a/libvideocodec/dec/ExynosVideoDecoder.c
+++ b/libvideocodec/dec/ExynosVideoDecoder.c
@@ -1173,7 +1173,10 @@ static ExynosVideoErrorType MFC_Decoder_Get_Geometry_Outbuf(
 
     struct v4l2_format fmt;
     struct v4l2_crop   crop;
-    int i, value;
+    int i;
+#ifdef V4L2_CID_MPEG_MFC_GET_10BIT_INFO
+    int value;
+#endif
 
     if (pCtx == NULL) {
         ALOGE("%s: Video context info must be supplied", __func__);
@@ -1219,6 +1222,7 @@ static ExynosVideoErrorType MFC_Decoder_Get_Geometry_Outbuf(
 #endif
         bufferConf->bInterlaced = VIDEO_FALSE;
 
+#ifdef V4L2_CID_MPEG_MFC_GET_10BIT_INFO
     exynos_v4l2_g_ctrl(pCtx->hDec, V4L2_CID_MPEG_MFC_GET_10BIT_INFO, &value);
     if (value == 1) {
         bufferConf->eFilledDataType = DATA_8BIT_WITH_2BIT;
@@ -1234,6 +1238,7 @@ static ExynosVideoErrorType MFC_Decoder_Get_Geometry_Outbuf(
 #endif
         }
     }
+#endif
 
     /* Get planes aligned buffer size */
     for (i = 0; i < pCtx->nOutbufPlanes; i++)