Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Sep 2013 10:41:35 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Sep 2013 10:42:11 +0000 (12:42 +0200)
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
  doc: Drop VDPAU from list of supported codecs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/general.texi

Simple merge