diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:16:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:16:15 +0100 |
| commit | 61b5dee49e74c400647951d1b0c26bb88116efb5 (patch) | |
| tree | 2d87e77e13da7a1ad5913f0d27e1caa1a0b4a287 /libavcodec/resample2.c | |
| parent | d8f6c5a79c10dff1c8e5717d760aec194fb81d9c (diff) | |
| parent | fc3c1156e361202ab97ad63ffb4dacc416906d33 (diff) | |
| download | ffmpeg-61b5dee49e74c400647951d1b0c26bb88116efb5.tar.gz | |
Merge commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33' into release/2.4
* commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33':
doc: Update changelog for v11.3
Conflicts:
Changelog
Not merged, the changelog is not correct for FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample2.c')
0 files changed, 0 insertions, 0 deletions