ifdef around jpeg

Review URL: https://webrtc-codereview.appspot.com/392021

git-svn-id: http://libyuv.googlecode.com/svn/trunk@182 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 181
+Version: 182
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,7 +11,7 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 181
+#define LIBYUV_VERSION 182
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 

source/convert.cc

@@ -1855,6 +1855,7 @@ int ConvertToI420(const uint8* sample, size_t sample_size,
                      dst_width, inv_dst_height);
       break;
     }
+#ifdef HAVE_JPEG
     case FOURCC_MJPG:
       r = MJPGToI420(sample, sample_size,
                      y, y_stride,
@@ -1862,6 +1863,7 @@ int ConvertToI420(const uint8* sample, size_t sample_size,
                      v, v_stride,
                      src_width, abs_src_height, dst_width, inv_dst_height);
       break;
+#endif
     default:
       return -1;  // unknown fourcc - return failure code.
   }