diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 04:45:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 04:45:30 +0200 |
| commit | 2178abd3b5311dd334f0380ea9521b18e4f2e564 (patch) | |
| tree | 11f8be8a7c9963b62218549f4bdc017fcb430325 /libavutil/sha.h | |
| parent | 52ec81c67d112ca8f1a0ae779a4b6e0f27f47ba3 (diff) | |
| parent | d7913bf59ccbf781ce57c5d58998e8f25d10e040 (diff) | |
| download | ffmpeg-2178abd3b5311dd334f0380ea9521b18e4f2e564.tar.gz | |
Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'
* commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040':
changelog: Move Ogg subtypes aliases entry to the correct release
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/sha.h')
0 files changed, 0 insertions, 0 deletions