Google Git
Sign in
android/platform/external/jpeg/refs/heads/brillo-m7-dev
commit
01ce4e0dfd73d2ec550e2efdb4fb228ca836083d
[log]
author
Chih-Hung Hsieh <[email protected]>
Wed Aug 19 15:25:00 2015 -0700
committer
Chih-Hung Hsieh <[email protected]>
Wed Aug 19 15:25:00 2015 -0700
tree
79b172eedb64b17be773e36b13875c95a3ab56d0
parent
9f3436c3b153b55257caca0345c8135514b26945 [diff]
parent
0fa7bb8caa7a1785591f4c17d37ddb9130560b34 [diff]
resolved conflicts for merge of 0fa7bb8c to mnc-dev-plus-aosp

Change-Id: I5aee0816a8ab0d531df88bffd70c6c91e07ebdfb
tree: 79b172eedb64b17be773e36b13875c95a3ab56d0
  1. Android.mk
  2. ansi2knr.1
  3. ansi2knr.c
  4. armv6_idct.S
  5. cderror.h
  6. cdjpeg.c
  7. cdjpeg.h
  8. change.log
  9. cjpeg.1
  10. cjpeg.c
  11. ckconfig.c
  12. CleanSpec.mk
  13. coderules.doc
  14. config.guess
  15. config.sub
  16. configure
  17. djpeg.1
  18. djpeg.c
  19. example.c
  20. filelist.doc
  21. install-sh
  22. install.doc
  23. jcapimin.c
  24. jcapistd.c
  25. jccoefct.c
  26. jccolor.c
  27. jcdctmgr.c
  28. jchuff.c
  29. jchuff.h
  30. jcinit.c
  31. jcmainct.c
  32. jcmarker.c
  33. jcmaster.c
  34. jcomapi.c
  35. jconfig.bcc
  36. jconfig.cfg
  37. jconfig.dj
  38. jconfig.doc
  39. jconfig.h
  40. jconfig.mac
  41. jconfig.manx
  42. jconfig.mc6
  43. jconfig.sas
  44. jconfig.st
  45. jconfig.vc
  46. jconfig.vms
  47. jconfig.wat
  48. jcparam.c
  49. jcphuff.c
  50. jcprepct.c
  51. jcsample.c
  52. jctrans.c
  53. jdapimin.c
  54. jdapistd.c
  55. jdatadst.c
  56. jdatasrc.c
  57. jdcoefct.c
  58. jdcolor.c
  59. jdct.h
  60. jddctmgr.c
  61. jdhuff.c
  62. jdhuff.h
  63. jdinput.c
  64. jdmainct.c
  65. jdmarker.c
  66. jdmaster.c
  67. jdmerge.c
  68. jdphuff.c
  69. jdpostct.c
  70. jdsample.c
  71. jdtrans.c
  72. jerror.c
  73. jerror.h
  74. jfdctflt.c
  75. jfdctfst.c
  76. jfdctint.c
  77. jidctflt.c
  78. jidctfst.c
  79. jidctint.c
  80. jidctintelsse.c
  81. jidctred.c
  82. jinclude.h
  83. jmemansi.c
  84. jmemdos.c
  85. jmemdosa.asm
  86. jmemmac.c
  87. jmemmgr.c
  88. jmemname.c
  89. jmemnobs.c
  90. jmemsys.h
  91. jmorecfg.h
  92. jpegint.h
  93. jpeglib.h
  94. jpegtran.1
  95. jpegtran.c
  96. jquant1.c
  97. jquant2.c
  98. jsimd_arm_neon.S
  99. jsimd_neon.c
  100. jsimd_neon.h
  101. jutils.c
  102. jversion.h
  103. libjpeg.doc
  104. ltconfig
  105. ltmain.sh
  106. makcjpeg.st
  107. makdjpeg.st
  108. makeapps.ds
  109. makefile.ansi
  110. makefile.bcc
  111. makefile.cfg
  112. makefile.dj
  113. makefile.manx
  114. makefile.mc6
  115. makefile.mms
  116. makefile.sas
  117. makefile.unix
  118. makefile.vc
  119. makefile.vms
  120. makefile.wat
  121. makelib.ds
  122. makeproj.mac
  123. makljpeg.st
  124. maktjpeg.st
  125. makvms.opt
  126. mips_idct_le.S
  127. mips_jidctfst.c
  128. MODULE_LICENSE_BSD_LIKE
  129. NOTICE
  130. rdbmp.c
  131. rdcolmap.c
  132. rdgif.c
  133. rdjpgcom.1
  134. rdjpgcom.c
  135. rdppm.c
  136. rdrle.c
  137. rdswitch.c
  138. rdtarga.c
  139. README
  140. structure.doc
  141. testimg.bmp
  142. testimg.jpg
  143. testimg.ppm
  144. testimgp.jpg
  145. testorig.jpg
  146. testprog.jpg
  147. transupp.c
  148. transupp.h
  149. usage.doc
  150. wizard.doc
  151. wrbmp.c
  152. wrgif.c
  153. wrjpgcom.1
  154. wrjpgcom.c
  155. wrppm.c
  156. wrrle.c
  157. wrtarga.c