From 9b7993c59ed2f5623c89f7c976ad02e3f53d47dd Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Fri, 2 Sep 2016 17:43:16 -0400 Subject: [PATCH] Updated ffmpeg library path and removed twice-defined signal --- src/podcast/ffmpeg/UBFFmpegVideoEncoder.h | 4 ---- src/podcast/podcast.pri | 8 +------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/podcast/ffmpeg/UBFFmpegVideoEncoder.h b/src/podcast/ffmpeg/UBFFmpegVideoEncoder.h index eed8c16b..c2e19de6 100644 --- a/src/podcast/ffmpeg/UBFFmpegVideoEncoder.h +++ b/src/podcast/ffmpeg/UBFFmpegVideoEncoder.h @@ -79,10 +79,6 @@ public: void setRecordAudio(bool pRecordAudio) { mShouldRecordAudio = pRecordAudio; } -signals: - - void encodingFinished(bool ok); - private slots: void setLastErrorMessage(const QString& pMessage); diff --git a/src/podcast/podcast.pri b/src/podcast/podcast.pri index 5b10ee9b..865060e0 100644 --- a/src/podcast/podcast.pri +++ b/src/podcast/podcast.pri @@ -42,15 +42,9 @@ linux-g++* { SOURCES += src/podcast/ffmpeg/UBFFmpegVideoEncoder.cpp - FFMPEG = /opt/ffmpeg - - INCLUDEPATH += $${FFMPEG}/include DEPENDPATH += /usr/lib/x86_64-linux-gnu - LIBS += -L $${FFMPEG}/lib -lavformat \ - -L $${FFMPEG}/lib -lavcodec \ - -L $${FFMPEG}/lib -lswscale \ - -L $${FFMPEG}/lib -lavutil \ + LIBS += -lavformat -lavcodec -lswscale -lavutil \ -lva-x11 \ -lva \ -lxcb-shm \