[FFmpeg-cvslog] Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 15:11:05 2014 +0200| [ad99837b638f1271da37dbe75d409b1350ad556e] | committer: Michael Niedermayer

Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'

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

Conflicts:
	libavcodec/ppc/idctdsp.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad99837b638f1271da37dbe75d409b1350ad556e
---