From 4bfe65d8abd29898901e5027101609b998dfd938 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 1 Jun 2015 12:42:56 +0300 Subject: [PATCH] ffmpeg added to os x build --- Telegram/SourceFiles/localimageloader.cpp | 2 +- Telegram/Telegram.xcodeproj/project.pbxproj | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/Telegram/SourceFiles/localimageloader.cpp b/Telegram/SourceFiles/localimageloader.cpp index 96a5aad3e..146e69583 100644 --- a/Telegram/SourceFiles/localimageloader.cpp +++ b/Telegram/SourceFiles/localimageloader.cpp @@ -105,7 +105,7 @@ void LocalImageLoaderPrivate::prepareImages() { } if (mime == "image/jpeg") { 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); mime = "audio/ogg"; } else { diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index e35874bb7..eb946c1f9 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1764,14 +1764,9 @@ ./SourceFiles, ./GeneratedFiles, /usr/local/include, - "./../../Libraries/libogg-1.3.2/include", ./../../Libraries/opus/include, - ./../../Libraries/opusfile/include, "./../../Libraries/openal-soft/include", - "./../../Libraries/mpg123-1.22.1/src/libmpg123", "./../../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/QtMultimedia", "/usr/local/Qt-5.4.0/include/QtWidgets", @@ -1855,14 +1850,9 @@ "-lz", "-lm", /usr/local/lib/libopenal.a, - /usr/local/lib/libopusfile.a, /usr/local/lib/libopus.a, - /usr/local/lib/libogg.a, /usr/local/lib/liblzma.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/libavformat.a, /usr/local/lib/libswresample.a, @@ -1917,14 +1907,9 @@ ./SourceFiles, ./GeneratedFiles, /usr/local/include, - "./../../Libraries/libogg-1.3.2/include", ./../../Libraries/opus/include, - ./../../Libraries/opusfile/include, "./../../Libraries/openal-soft/include", - "./../../Libraries/mpg123-1.22.1/src/libmpg123", "./../../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/QtMultimedia", "/usr/local/Qt-5.4.0/include/QtWidgets", @@ -2007,14 +1992,9 @@ "-lz", "-lm", /usr/local/lib/libopenal.a, - /usr/local/lib/libopusfile.a, /usr/local/lib/libopus.a, - /usr/local/lib/libogg.a, /usr/local/lib/liblzma.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/libavformat.a, /usr/local/lib/libswresample.a,