[FFmpeg-cvslog] Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 12:03:22 2013 +0100| [b13cd2d86763cddd754bab204b0893d7bf7e123b] | committer: Michael Niedermayer

Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'

* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
  lavc: remove disabled FF_API_IDCT cruft

Conflicts:
	libavcodec/version.h

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

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