diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 12:18:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 12:18:21 +0200 |
| commit | e7811e48be26649c05a813efc9d47ea42ac916ee (patch) | |
| tree | 4747e1b5710d9663d57915ba6e82e54c29e9f474 /libavcodec/sipr.c | |
| parent | a826efb55ad845e4a03c9ae19a83fd51604fd737 (diff) | |
| parent | f60c3a7c1b1ef3fa5adf4ea62bbe7b8ba346f7c5 (diff) | |
| download | ffmpeg-e7811e48be26649c05a813efc9d47ea42ac916ee.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavd/x11grab: Support AV_PIX_FMT_PAL8.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions