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

Merge commit '027712e851da4d124a842c9e2802f95d50582553'

* commit '027712e851da4d124a842c9e2802f95d50582553':
  jvdec: Return EOF on end of file

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

d2344afb90db38c8e0367b05540f21c4fb2e91a1