diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 10:24:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 10:24:23 +0200 |
| commit | ca2160b5b3d9aec02d7c1d93e445b8cfb9c7716c (patch) | |
| tree | 18784a98ada57123f637d8aa5ebc134f0e1d856b /libswresample/swresample.c | |
| parent | 4ddb3a6df0f6ad053c8455e074c1e6688b051272 (diff) | |
| parent | 42604902292ebaba39b13e8efd98419908518019 (diff) | |
| download | ffmpeg-ca2160b5b3d9aec02d7c1d93e445b8cfb9c7716c.tar.gz | |
Merge commit '42604902292ebaba39b13e8efd98419908518019'
* commit '42604902292ebaba39b13e8efd98419908518019':
Prepare for 11_beta1 Release
Conflicts:
RELEASE
No change, not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
0 files changed, 0 insertions, 0 deletions