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)
commite7811e48be26649c05a813efc9d47ea42ac916ee
tree4747e1b5710d9663d57915ba6e82e54c29e9f474
parenta826efb55ad845e4a03c9ae19a83fd51604fd737
parentf60c3a7c1b1ef3fa5adf4ea62bbe7b8ba346f7c5
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavd/x11grab: Support AV_PIX_FMT_PAL8.

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