Merge commit '027712e851da4d124a842c9e2802f95d50582553'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 22:49:56 +0000 (23:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 22:50:58 +0000 (23:50 +0100)
commitd2344afb90db38c8e0367b05540f21c4fb2e91a1
treee15ea7d45084213ae8e3be89413b49ac5acada98
parentce612fc1863830f1b5255beb42e244138f78e145
parent027712e851da4d124a842c9e2802f95d50582553
Merge commit '027712e851da4d124a842c9e2802f95d50582553'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/jvdec.c