diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:00:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:03:44 +0100 |
| commit | eb2244ece9cbc4bd26dea553c318635a98c9d6de (patch) | |
| tree | ec72b8e0c06b9f0298256338768650e96e2a49f8 /libavutil/opencl.c | |
| parent | b967c10029bd35623b306168ac6fdf86cb3d080e (diff) | |
| parent | 4015829accc2382393d42d62654eb96d896d1326 (diff) | |
| download | ffmpeg-eb2244ece9cbc4bd26dea553c318635a98c9d6de.tar.gz | |
Merge commit '4015829accc2382393d42d62654eb96d896d1326' into release/2.2
* commit '4015829accc2382393d42d62654eb96d896d1326':
bit_depth_template: Use file name as multiple inclusion guard
svq3: Adjust #endif comment
hevc: Mention the missing SPS in the error message
doc: Name the MOV muxer as it should be called
doc: Sort the muxer documentation
Conflicts:
doc/muxers.texi
All changes are already in our 2.2 branch, this is just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opencl.c')
0 files changed, 0 insertions, 0 deletions