                 );
  
  #ifdef USE_SAMSUNG_COLORFORMAT
-@@ -1530,7 +1650,7 @@ status_t OMXCodec::setVideoOutputFormat(
-         }
- #endif
- 
--#endif
-+//#endif
- 
-         int32_t colorFormat;
-         if (meta->findInt32(kKeyColorFormat, &colorFormat)
-@@ -1717,6 +1837,10 @@ void OMXCodec::setComponentRole(
+@@ -1717,6 +1743,10 @@ void OMXCodec::setComponentRole(
              "video_decoder.mpeg4", "video_encoder.mpeg4" },
          { MEDIA_MIMETYPE_VIDEO_H263,
              "video_decoder.h263", "video_encoder.h263" },

         { MEDIA_MIMETYPE_VIDEO_VPX,
             "video_decoder.vpx", "video_encoder.vpx" },
         { MEDIA_MIMETYPE_AUDIO_RAW,
@@ -1809,6 +1933,16 @@ status_t OMXCodec::init() {
     CHECK_EQ((int)mState, (int)LOADED);
 
     status_t err;

     { "OMX.google.vorbis.decoder", "vorbisdec", "audio_decoder.vorbis" },
     { "OMX.google.vpx.decoder", "vpxdec", "video_decoder.vpx" },
diff --git a/frameworks/av/services/audioflinger/AudioFlinger.cpp b/frameworks/av/services/audioflinger/AudioFlinger.cpp
index 84e2498..5867c70 100644
--- a/frameworks/av/services/audioflinger/AudioFlinger.cpp
+++ b/frameworks/av/services/audioflinger/AudioFlinger.cpp
@@ -79,7 +79,7 @@
