diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 01:40:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 01:40:49 +0200 |
| commit | 1816f5509e4f0fd55d32b5dbf70c3be21c1b1515 (patch) | |
| tree | 75ed13ca697c0a7ac8031726d1138d50c77c9e58 /libavcodec/libmp3lame.c | |
| parent | 37ded53037196144eb712daa5decaca7f92ae3c6 (diff) | |
| parent | 816c579cf3cbd079c1b14aaa063b61eed4c555ad (diff) | |
| download | ffmpeg-1816f5509e4f0fd55d32b5dbf70c3be21c1b1515.tar.gz | |
Merge https://github.com/lukaszmluki/ffmpeg
* https://github.com/lukaszmluki/ffmpeg:
ftp: warning about pure-ftp server used as and output
ftp: comments
ftp: remove unused headers
ftp: fix interrupt callback misuse
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libmp3lame.c')
0 files changed, 0 insertions, 0 deletions