diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 21:21:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 21:21:47 +0200 |
| commit | 5393c9dadd23f33ca5e22a904131fccffb7ec070 (patch) | |
| tree | 8fd3444321de6bf7f509c93c52ef996f306829ac /libavformat/mpjpeg.c | |
| parent | 0ddb0516f11383a4c007bb4738de37a4f85c37c0 (diff) | |
| parent | f07a4290a0e8f31796e348edd3ed06b8d15132d8 (diff) | |
| download | ffmpeg-5393c9dadd23f33ca5e22a904131fccffb7ec070.tar.gz | |
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
x11grab: K&R formatting cosmetics
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpjpeg.c')
0 files changed, 0 insertions, 0 deletions