diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:49:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:49:12 +0200 |
| commit | 1aab0609968ea9dabf53a7ceab85b21954fe0cf1 (patch) | |
| tree | 1ccca145cbe227a3eb18d798a1ab2af3bf497c72 /libavdevice/alsa-audio.h | |
| parent | 3bc5aa65bbcf79e869461a557bea356a66e0e77e (diff) | |
| parent | d0af7d5745f3e228293633faa9e57994f3308c31 (diff) | |
| download | ffmpeg-1aab0609968ea9dabf53a7ceab85b21954fe0cf1.tar.gz | |
Merge commit 'd0af7d5745f3e228293633faa9e57994f3308c31' into release/2.2
* commit 'd0af7d5745f3e228293633faa9e57994f3308c31':
Update Changelog for v10.5
Prepare for 10.5 release
Conflicts:
Changelog
RELEASE
no change as FFmpeg releases dont match this
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio.h')
0 files changed, 0 insertions, 0 deletions