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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 10 02:21:00 2013 +0100| [07ab8d3369b2fee9d3871a5f65313be5d9fe5c89] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Revert "build: disable iconv by default."

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

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