diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 22:53:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 22:53:25 +0100 |
| commit | b967c10029bd35623b306168ac6fdf86cb3d080e (patch) | |
| tree | ec72b8e0c06b9f0298256338768650e96e2a49f8 | |
| parent | 7ff4cd2acc8cdea09b0738bed35942805fe9b2e8 (diff) | |
| parent | 39dc4a6bb34baf833ce1e5eabad7d0dbf933237d (diff) | |
| download | ffmpeg-b967c10029bd35623b306168ac6fdf86cb3d080e.tar.gz | |
Merge commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d' into release/2.2
* commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d':
x86: dca: Add missing multiple inclusion guards
gitignore: Add all examples below doc/examples
arm: Mark the stack as non-executable
doxygen: Replace @parblock syntax with manual linebreaks
doxygen: Add a number of missing function parameter descriptions
Conflicts:
.gitignore
libavformat/avformat.h
All changes are already in our 2.2 branch, this is just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions