Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:17:46 +0000 (21:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:17:46 +0000 (21:17 +0100)
commit2631d155baa5bf9e335925d44fcfd276c6d3719f
tree1160e079ef68f8892ac186da6659844ade28a493
parent07dbdcf9d0d4b3fadab53d67901190d15b32ce2f
parent6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f
Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'

* commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f':
  build: Drop stray MJPEG encoder dependency on dsputil

Conflicts:
configure

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