diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 13:58:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 13:58:41 +0200 |
| commit | 7509a95656cd0bf663ee2654763d8840d1662a88 (patch) | |
| tree | 5dbcfbe890de86e7895a126da4e675b73aa2ed46 /libavformat | |
| parent | 33bf66af02fe07ad810bea792782388c34be5e66 (diff) | |
| parent | 65e78a2e4b111627c0ebdf2c9baec95e5e21560d (diff) | |
| download | ffmpeg-7509a95656cd0bf663ee2654763d8840d1662a88.tar.gz | |
Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'
* commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
x11grab: Refactor pixel format parsing
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions