[FFmpeg-cvslog] Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 11 12:41:35 2013 +0200| [c45e9097d839e69ab74160386db5e9728deaaf62] | committer: Michael Niedermayer

Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'

* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
  doc: Drop VDPAU from list of supported codecs

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

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