summaryrefslogtreecommitdiff
path: root/extra/kradio/kradio-ffmpeg.diff
diff options
context:
space:
mode:
Diffstat (limited to 'extra/kradio/kradio-ffmpeg.diff')
-rw-r--r--extra/kradio/kradio-ffmpeg.diff34
1 files changed, 0 insertions, 34 deletions
diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff
deleted file mode 100644
index 27d224fec..000000000
--- a/extra/kradio/kradio-ffmpeg.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
-
-diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
-index 4cd6cc0..c74d6e2 100644
---- a/plugins/internetradio/decoder_thread.cpp
-+++ b/plugins/internetradio/decoder_thread.cpp
-@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-
- //av_log_set_level(255);
- m_av_pFormatCtx = avformat_alloc_context();
-- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
- m_av_pFormatCtx->probesize = m_maxProbeSize;
- m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
-
-@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
- m_av_pFormatCtx_opened = true;
- }
- else {
--
- // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
- if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
- if (warningsNotErrors) {
-@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
- m_av_audioStream = -1;
- for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
- // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
-+#else
-+ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
-+#endif
- m_av_audioStream = i;
- break;
- }