Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:37:04 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:37:09 +0000 (13:37 +0100)
* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

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

Simple merge