2 files changed, 4 insertions, 5 deletions
diff --git a/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_swvenc_mpeg4.h b/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_swvenc_mpeg4.h
index 0443c80..41ec9f9 100644
--- a/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_swvenc_mpeg4.h
+++ b/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_swvenc_mpeg4.h
@@ -1,5 +1,5 @@
 /*--------------------------------------------------------------------------
-Copyright (c) 2014, The Linux Foundation. All rights reserved.
+Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -143,6 +143,8 @@ class omx_venc: public omx_video
         bool dev_get_output_log_flag();
         int dev_output_log_buffers(const char *buffer_addr, int buffer_len);
         int dev_extradata_log_buffers(char *buffer);
+        bool swvenc_color_align(OMX_BUFFERHEADERTYPE *buffer, OMX_U32 width,
+                                OMX_U32 height);
 
         SWVENC_STATUS swvenc_set_rc_mode(OMX_VIDEO_CONTROLRATETYPE eControlRate);
         SWVENC_STATUS swvenc_set_profile_level(OMX_U32 eProfile,OMX_U32 eLevel);
@@ -150,6 +152,7 @@ class omx_venc: public omx_video
         SWVENC_STATUS swvenc_set_frame_rate(OMX_U32 nFrameRate);
         SWVENC_STATUS swvenc_set_bit_rate(OMX_U32 nTargetBitrate);
         SWVENC_STATUS swvenc_set_intra_period(OMX_U32 nPFrame,OMX_U32 nBFrame);
+        SWVENC_STATUS swvenc_set_color_format(OMX_COLOR_FORMATTYPE);
         SWVENC_STATUS swvenc_get_buffer_req
         (
            OMX_U32 *min_buff_count,
diff --git a/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_video_encoder.h b/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_video_encoder.h
index e648799..fc26690 100644
--- a/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_video_encoder.h
+++ b/msmcobalt/mm-video-v4l2/vidc/venc/inc/omx_video_encoder.h
@@ -31,11 +31,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <unistd.h>
 #include "omx_video_base.h"
-#ifdef _MSM8974_
 #include "video_encoder_device_v4l2.h"
-#else
-#include "video_encoder_device.h"
-#endif
 
 extern "C" {
     OMX_API void * get_omx_component_factory_fn(void);