diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-29 03:10:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-29 03:10:10 +0200 |
commit | a907fc0b21fadfdb92721843b75fa629d26297c8 (patch) | |
tree | 266335c731c15289a5e509c01e54634be114c659 /libavformat/flv.h | |
parent | d77ad6ec2d14db84973faf53cc1405d517769391 (diff) | |
parent | e122fb594a5feb6729cce86a70aafd93d10202d8 (diff) | |
download | ffmpeg-a907fc0b21fadfdb92721843b75fa629d26297c8.tar.gz |
Merge commit 'e122fb594a5feb6729cce86a70aafd93d10202d8' into release/0.10
* commit 'e122fb594a5feb6729cce86a70aafd93d10202d8':
Update Changelog for 0.8.13
Prepare for 0.8.13 Release
Conflicts:
Changelog
RELEASE
merge for metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flv.h')
0 files changed, 0 insertions, 0 deletions