[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  2 12:47:44 2013 +0200| [0beff42823223659d75e7382d41a1e2a954bbfad] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: K&R formatting cosmetics
  ppc: Only compile AltiVec FFT assembly when AltiVec is enabled

Conflicts:
	libavformat/id3v2.c

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

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