diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:22:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:22:55 +0200 |
| commit | 16bb8faac6d51e342b64974ceb2f8edd7955f9fa (patch) | |
| tree | b97eda9819e39c14da334f1cf99b44eadb055319 /libavutil/pixdesc.h | |
| parent | c2df95978b19d0d4b625c23a05f4bf78e8397d0b (diff) | |
| parent | 4be292dac7e7f0586053fcced8d530ccf4ebef29 (diff) | |
Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'
* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
atrac: Move doxygen comments to the header
Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.h')
0 files changed, 0 insertions, 0 deletions