diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 19:37:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 19:37:50 +0100 |
| commit | 9be63be1b285aee4f9ef597f0284e91a2f25a386 (patch) | |
| tree | e0048dfc755566fb4583d4f8a601a76cd74e5ee9 /libavutil/timer.h | |
| parent | d6acf45ec280be866698966947a0887841a6ea20 (diff) | |
| parent | bd316109b33362dbaf2629c16e05bf65adbf8573 (diff) | |
| download | ffmpeg-9be63be1b285aee4f9ef597f0284e91a2f25a386.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
apidoc: fix warning from stereo3d.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timer.h')
0 files changed, 0 insertions, 0 deletions