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)
* commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f':
  build: Drop stray MJPEG encoder dependency on dsputil

Conflicts:
configure

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

No differences found