diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 22:06:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 22:06:48 +0200 |
| commit | c6a3b009249892e7cfac59ca3c2b489e2c88b22b (patch) | |
| tree | 3ce1139ecbf234918b13531d97e6851829fa6c28 /libavcodec/sipr.h | |
| parent | 1fc396318833280a520bf568d5605791decf87d7 (diff) | |
| parent | 58396e806c65fe0eb00e6ccf1980f810cdceed05 (diff) | |
| download | ffmpeg-c6a3b009249892e7cfac59ca3c2b489e2c88b22b.tar.gz | |
Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'
* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
x11grab: Use a typedef for the context, as most other code does
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.h')
0 files changed, 0 insertions, 0 deletions