diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:21:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:21:01 +0100 |
commit | 74e52afe8f8ac02e66cf174ef052f2266130162f (patch) | |
tree | 6ee49e52e0d304bbb9831e6b0eb091851b791ad6 /libavcodec/ws-snd1.c | |
parent | 8eaecab5f401edee0ba49c32d3658777a7b0e337 (diff) | |
parent | 489c180451b1cde469f6aeea44f8bdb11cd941d0 (diff) | |
download | ffmpeg-74e52afe8f8ac02e66cf174ef052f2266130162f.tar.gz |
Merge commit '489c180451b1cde469f6aeea44f8bdb11cd941d0' into release/1.1
* commit '489c180451b1cde469f6aeea44f8bdb11cd941d0':
Add some bug references to the changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ws-snd1.c')
0 files changed, 0 insertions, 0 deletions