Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Oct 2013 10:18:14 +0000 (12:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Oct 2013 10:18:21 +0000 (12:18 +0200)
* cehoyos/master:
  lavd/x11grab: Support AV_PIX_FMT_PAL8.

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

Trivial merge