Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:17:51 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:17:51 +0000 (12:17 +0100)
commitad48c9374e13ecdf1399c44e9ea443a77232168a
tree3432550c5a40fc663d8914c8806918b910633783
parentc4c2b2ea5c0a1879f512c2023956d7322edc98d3
parent8e0cf39faf02536dca08f4fe628a66d1ae022fde
Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'

* commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde':
  build: Let all MJPEG-related decoders depend on the MJPEG decoder

Conflicts:
configure
libavcodec/Makefile

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