From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 20 Dec 2013 22:56:43 +0000 (+0100)
Subject: Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'
X-Git-Tag: android-x86-6.0-r1~8190
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b9f33ad32077eb0570a9038a9ff93a176ef66dfe;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

* commit 'e518cb863edc931888ccca6cad86f73ca7430cef':
  jvdec: Fix memory leak of jv->frames

See: 596814f9781772050c65bdd8add27445bc8374a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

b9f33ad32077eb0570a9038a9ff93a176ef66dfe