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)
commit6deaab360c9c79e686265c99b9f9afc1d0068a8f
tree1197e5035e76d517af4ea3d469e29f8e8412ce67
parent0ebdf8d9ec603c895dc84f405d973922952d22b7
parent72c0b8f724a71d2784aecad0e5221e7ab6206371
Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'

* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

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