Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:42:14 +0000 (21:42 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:42:14 +0000 (21:42 +0200)
commit948a15195c69da2ff9a4b0ac7df782ba1cc2795f
tree9a461846aa7ce2427422a684bce93ea34c5db653
parentfd280de7eeb8657c406e89dd4c84b5ffab9c0508
parentb075869bc1e1aadea0a8dc819ebfb758adb9e3d0
Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'

* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
  configure: Factor out flacdsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile

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