Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:59:45 +0000 (21:59 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:59:45 +0000 (21:59 +0200)
commit77cd5193a5a5f745769123466b13aa52481436a2
treefe190d7439a9182dfcb8050e1072af5916d4443e
parentccd3edf81fc2f5a70f1218ce0b3595481bfec0e6
parent575ec60e542114b2ef5b2f88b28eeb72389dda45
Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'

* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
  configure: Factor out mss34dsp module

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure
libavcodec/Makefile