diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:31:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:41:20 +0200 |
| commit | efcf8cfa48c84676417d40689e63a37d5190a8ed (patch) | |
| tree | 697d52e6bf95cb1660fb4a240ef81482277916e2 /libavformat/aacdec.c | |
| parent | a829040c431acc6164d65e2967169aad85a5373e (diff) | |
| parent | 24ad3ac6a3e20350214e6c3f7a931635f264ae07 (diff) | |
| download | ffmpeg-efcf8cfa48c84676417d40689e63a37d5190a8ed.tar.gz | |
Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'
* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
nut: Drop doxygen markers
Conflicts:
libavformat/nut.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aacdec.c')
0 files changed, 0 insertions, 0 deletions