diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 21:39:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 21:39:19 +0200 |
| commit | 65c9e2d0030d76c055461e25e22b9e8fa641560d (patch) | |
| tree | 62c7ffc97ac9ae9b8db1d7344a14f08a32e9af95 /libavformat/matroska.c | |
| parent | 5393c9dadd23f33ca5e22a904131fccffb7ec070 (diff) | |
| parent | 20e82b41fcad23ebbb18d89948aebfcc53921198 (diff) | |
| download | ffmpeg-65c9e2d0030d76c055461e25e22b9e8fa641560d.tar.gz | |
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'
* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
x11grab: Small near-cosmetic refactorings
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
0 files changed, 0 insertions, 0 deletions