Merge branch 'upstream' into tizen

Change-Id: I9c1bfc9e38ebc707c8677184308fdead3daee7e1

diff --cc CMakeLists.txt
Simple merge

diff --cc jdcoefct.c
Simple merge

diff --cc jdmerge.c
index 5cc42a5,3a456d6..d8a0081
--- 1/jdmerge.c
--- 2/jdmerge.c
+++ b/jdmerge.c
@@@ -254,12 -226,9 +226,12 @@@ merged_2v_upsample(j_decompress_ptr cin
                     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)
  /* 2:1 vertical sampling case: may need a spare row. */
  {
-   my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+   my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
    JSAMPROW work_ptrs[2];
    JDIMENSION num_rows;          /* number of rows returned to caller */
 +#if _USE_PRODUCT_TV
 +  int skip = 0;
 +#endif
  
    if (upsample->spare_full) {
      /* If we have a spare row saved from a previous cycle, just return it. */

diff --cc jpeglib.h
Simple merge

diff --cc jquant2.c
Simple merge

diff --cc simd/arm/jsimd.c
Simple merge

diff --cc simd/arm/jsimd_neon.S
Simple merge

diff --cc simd/jsimd.h
Simple merge

diff --cc tjbench.c
Simple merge

diff --cc tjunittest.c
Simple merge