diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:41:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:51:03 +0200 |
| commit | b37ff488b8aab2fe1245f1ba3130b1d881559794 (patch) | |
| tree | 916940e9d93bfa3116056dca38aba3b1a340403c /libavresample/x86/audio_convert.asm | |
| parent | ef13a005c41c353b03b29edf7a20d226747dac4e (diff) | |
| parent | e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65 (diff) | |
| download | ffmpeg-b37ff488b8aab2fe1245f1ba3130b1d881559794.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavutil: Make avpriv_open a library-internal function on msvcrt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/audio_convert.asm')
0 files changed, 0 insertions, 0 deletions