diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 13:24:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 13:24:43 +0100 |
| commit | 6b36f577a12a0e940b43984d442e1cca7e272b63 (patch) | |
| tree | 9af78400afc8b1c87d8fb2cc70219ade3425606a /libavresample/avresample.h | |
| parent | cd355d4d59666383f7c1f5973a8d6be20623b622 (diff) | |
| parent | 1716b4c7b888a00380b36d3a49f725e6a243ed18 (diff) | |
| download | ffmpeg-6b36f577a12a0e940b43984d442e1cca7e272b63.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mms: Remove non-utf8 characters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresample.h')
0 files changed, 0 insertions, 0 deletions