diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:33:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:44:49 +0100 |
| commit | a1b5cf01816884f89345004d6f8b89f6448a36ef (patch) | |
| tree | 5b23a50d92642193584d77d4244663514d4332f2 /libavcodec/arm | |
| parent | 2fbdf30efe994a9956a27d845010b57a5fc1deeb (diff) | |
| parent | 85b3b1c4ba7af9c2658442b0aafd27d613e1854b (diff) | |
| download | ffmpeg-a1b5cf01816884f89345004d6f8b89f6448a36ef.tar.gz | |
Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
xcbgrab: Unbreak parsing filename options
Conflicts:
libavdevice/xcbgrab.c
See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
0 files changed, 0 insertions, 0 deletions