[FFmpeg-cvslog] Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 20 23:56:43 2013 +0100| [b9f33ad32077eb0570a9038a9ff93a176ef66dfe] | committer: Michael Niedermayer

Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9f33ad32077eb0570a9038a9ff93a176ef66dfe
---