diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 22:19:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 22:19:41 +0100 |
| commit | 26dad980baaa6858561b3269d375c1d9223f579c (patch) | |
| tree | 0607c7efcc3799b9f4ffe9f7f6c4b3844d691cc9 /libavutil/buffer.h | |
| parent | 6b06f9f1bc4c51a96186021bf0f99599e49aff47 (diff) | |
| parent | 48d1ed9c83ee0c388e8c2898e81ffb4add509ab9 (diff) | |
| download | ffmpeg-26dad980baaa6858561b3269d375c1d9223f579c.tar.gz | |
Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/buffer.h')
0 files changed, 0 insertions, 0 deletions