diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:23:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:23:30 +0100 |
| commit | 82c96b5ad88ec2c1342423a6855cd366e788a590 (patch) | |
| tree | 02a8d62b7cc543e1f09a6ed64f7231d94a928ac7 /libavcodec/gsmdec_template.c | |
| parent | 3e4b95784793555d2216139f10375ec09f290876 (diff) | |
| parent | e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd (diff) | |
| download | ffmpeg-82c96b5ad88ec2c1342423a6855cd366e788a590.tar.gz | |
Merge commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd' into release/2.2
* commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd':
changelog: Cleanups and prepare for v10_beta2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec_template.c')
0 files changed, 0 insertions, 0 deletions