Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 21:04:47 +0000 (23:04 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 21:04:47 +0000 (23:04 +0200)
commitc7c33ab721cfafbbe269c8f1505eb2d9a80d7af4
tree27f85a58ac742deb2c037e05ccbb7ee56b7540ff
parent65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c
parentf5ee23004d1177ca6dd99b92cb4ff4b94b2eae09
Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'

* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
  configure: Factor out g722dsp module

Conflicts:
configure
libavcodec/arm/Makefile

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