diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:12:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:12:50 +0100 |
| commit | 2fbdf30efe994a9956a27d845010b57a5fc1deeb (patch) | |
| tree | 4f7577ac1a6c527c9d6744755490167f142ddece /ffmpeg_filter.c | |
| parent | 53dd75e91154100a83b11f6ef9dfd15d79bcc3aa (diff) | |
| parent | b31328d008985f87f0a7c83c700847cef1a4f08c (diff) | |
| download | ffmpeg-2fbdf30efe994a9956a27d845010b57a5fc1deeb.tar.gz | |
Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'
* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c':
xcbgrab: Provide better names for the y and x option
Conflicts:
doc/indevs.texi
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions