[FFmpeg-cvslog] Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 11:53:19 2013 +0200| [0724b4a16d6b88b311610e96c7ba341a4b33965d] | committer: Michael Niedermayer

Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'

* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
  h264: Integrate clear_blocks calls with IDCT

Conflicts:
	libavcodec/arm/h264idct_neon.S
	libavcodec/h264idct_template.c
	libavcodec/x86/h264_idct.asm

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

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