Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)
commitad99837b638f1271da37dbe75d409b1350ad556e
tree40bdfb426c9f372de95ca17bc8066ca1163eb2e0
parent713dbe0655e4c3a906b0d812a6f90ac161223876
parent03c9f357a4c2307a7913cea2cbf0ba817e80beb6
Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'

* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
  ppc: idctdsp: Immediately return if no AltiVec is available

Conflicts:
libavcodec/ppc/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ppc/idctdsp.c