diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 21:47:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 21:51:34 +0200 |
| commit | 1fc396318833280a520bf568d5605791decf87d7 (patch) | |
| tree | 78af0fc0254e2ba38d8911d8d76986cd842bfb90 /libavcodec/arm/fmtconvert_neon.S | |
| parent | 65c9e2d0030d76c055461e25e22b9e8fa641560d (diff) | |
| parent | 7bb505a33ca131906b2ceb2f298e104c862740ea (diff) | |
| download | ffmpeg-1fc396318833280a520bf568d5605791decf87d7.tar.gz | |
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
x11grab: Drop a spurious space in the extension reporting message
Conflicts:
libavdevice/x11grab.c
See: 9af209712099699d717596f55b08b3bac8b6b563
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fmtconvert_neon.S')
0 files changed, 0 insertions, 0 deletions