procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ffmpeg added to os x build

This commit is contained in:
John Preston 2015-06-01 12:42:56 +03:00
parent 1b06fe1220
commit 4bfe65d8ab
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/localimageloader.cpp
View File

@ -105,7 +105,7 @@ void LocalImageLoaderPrivate::prepareImages() {
} }
if (mime == "image/jpeg") { if (mime == "image/jpeg") {
filename = filedialogDefaultName(qsl("image"), qsl(".jpg"), QString(), true); filename = filedialogDefaultName(qsl("image"), qsl(".jpg"), QString(), true);
} else if (mime == "application/ogg" && type == ToPrepareAudio) { } else if (type == ToPrepareAudio) {
filename = filedialogDefaultName(qsl("audio"), qsl(".ogg"), QString(), true); filename = filedialogDefaultName(qsl("audio"), qsl(".ogg"), QString(), true);
mime = "audio/ogg"; mime = "audio/ogg";
} else { } else {

20
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1764,14 +1764,9 @@
./SourceFiles, ./SourceFiles,
./GeneratedFiles, ./GeneratedFiles,
/usr/local/include, /usr/local/include,
"./../../Libraries/libogg-1.3.2/include",
./../../Libraries/opus/include, ./../../Libraries/opus/include,
./../../Libraries/opusfile/include,
"./../../Libraries/openal-soft/include", "./../../Libraries/openal-soft/include",
"./../../Libraries/mpg123-1.22.1/src/libmpg123",
"./../../Libraries/libexif-0.6.20", "./../../Libraries/libexif-0.6.20",
"./../../Libraries/faad2-2.7/include",
"./../../Libraries/faad2-2.7/common/mp4ff",
"/usr/local/Qt-5.4.0/include", "/usr/local/Qt-5.4.0/include",
"/usr/local/Qt-5.4.0/include/QtMultimedia", "/usr/local/Qt-5.4.0/include/QtMultimedia",
"/usr/local/Qt-5.4.0/include/QtWidgets", "/usr/local/Qt-5.4.0/include/QtWidgets",
@ -1855,14 +1850,9 @@
"-lz", "-lz",
"-lm", "-lm",
/usr/local/lib/libopenal.a, /usr/local/lib/libopenal.a,
/usr/local/lib/libopusfile.a,
/usr/local/lib/libopus.a, /usr/local/lib/libopus.a,
/usr/local/lib/libogg.a,
/usr/local/lib/liblzma.a, /usr/local/lib/liblzma.a,
/usr/local/lib/libexif.a, /usr/local/lib/libexif.a,
/usr/local/lib/libmpg123.a,
/usr/local/lib/libfaad.a,
/usr/local/lib/libmp4ff.a,
/usr/local/lib/libavcodec.a, /usr/local/lib/libavcodec.a,
/usr/local/lib/libavformat.a, /usr/local/lib/libavformat.a,
/usr/local/lib/libswresample.a, /usr/local/lib/libswresample.a,
@ -1917,14 +1907,9 @@
./SourceFiles, ./SourceFiles,
./GeneratedFiles, ./GeneratedFiles,
/usr/local/include, /usr/local/include,
"./../../Libraries/libogg-1.3.2/include",
./../../Libraries/opus/include, ./../../Libraries/opus/include,
./../../Libraries/opusfile/include,
"./../../Libraries/openal-soft/include", "./../../Libraries/openal-soft/include",
"./../../Libraries/mpg123-1.22.1/src/libmpg123",
"./../../Libraries/libexif-0.6.20", "./../../Libraries/libexif-0.6.20",
"./../../Libraries/faad2-2.7/include",
"./../../Libraries/faad2-2.7/common/mp4ff",
"/usr/local/Qt-5.4.0/include", "/usr/local/Qt-5.4.0/include",
"/usr/local/Qt-5.4.0/include/QtMultimedia", "/usr/local/Qt-5.4.0/include/QtMultimedia",
"/usr/local/Qt-5.4.0/include/QtWidgets", "/usr/local/Qt-5.4.0/include/QtWidgets",
@ -2007,14 +1992,9 @@
"-lz", "-lz",
"-lm", "-lm",
/usr/local/lib/libopenal.a, /usr/local/lib/libopenal.a,
/usr/local/lib/libopusfile.a,
/usr/local/lib/libopus.a, /usr/local/lib/libopus.a,
/usr/local/lib/libogg.a,
/usr/local/lib/liblzma.a, /usr/local/lib/liblzma.a,
/usr/local/lib/libexif.a, /usr/local/lib/libexif.a,
/usr/local/lib/libmpg123.a,
/usr/local/lib/libfaad.a,
/usr/local/lib/libmp4ff.a,
/usr/local/lib/libavcodec.a, /usr/local/lib/libavcodec.a,
/usr/local/lib/libavformat.a, /usr/local/lib/libavformat.a,
/usr/local/lib/libswresample.a, /usr/local/lib/libswresample.a,