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)
* commit '027712e851da4d124a842c9e2802f95d50582553':
  jvdec: Return EOF on end of file

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

Simple merge