Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:06:42 +0000 (00:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:06:42 +0000 (00:06 +0100)
commit7fce8c752d87ca4738179bb7e9238bae67abdeac
treecf884999bbf61ac8a23cc37843915e49e51a42d7
parent5c17377e28e818d3074a608d42821d66f1d26e8d
parent71f1ad37d858b810b71a4af1c25771beaa50b27b
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'

* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
  lavc: do not compile fmtconvert unconditionally

Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile

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