From: DRC <information@libjpeg-turbo.org>
Date: Thu, 25 Feb 2016 23:15:21 +0000 (-0600)
Subject: Merge branch '1.4.x'
X-Git-Tag: 1.4.90~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45c1e3a88782b069b446307ee8852f547a83e3af;p=libjpeg-turbo

Merge branch '1.4.x'
---

45c1e3a88782b069b446307ee8852f547a83e3af
diff --cc ChangeLog.txt
index ccff54f,90e67f3..8adad4b
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@@ -112,6 -19,9 +112,9 @@@ to construct a JPEG image in which a si
  long, so this version of libjpeg-turbo activates the accelerated Huffman
  decoder only if there are > 512 bytes of data in the input buffer.
  
 -[3] Fixed a memory leak in tjunittest encountered when running the program
++[18] Fixed a memory leak in tjunittest encountered when running the program
+ with the -yuv option.
+ 
  
  1.4.2
  =====