| 1 |
dilfridge 11/12/01 21:55:03 |
| 2 |
|
| 3 |
Added: kradio-4.0.2-libav.patch |
| 4 |
Log: |
| 5 |
Add recent libav fix from sabayon / upstream, bug 392369 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.39/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/kradio/files/kradio-4.0.2-libav.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/kradio/files/kradio-4.0.2-libav.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/kradio/files/kradio-4.0.2-libav.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kradio-4.0.2-libav.patch |
| 16 |
=================================================================== |
| 17 |
X-Git-Url: |
| 18 |
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 |
| 19 |
|
| 20 |
diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp |
| 21 |
index 4cd6cc0..c74d6e2 100644 |
| 22 |
--- a/plugins/internetradio/decoder_thread.cpp |
| 23 |
+++ b/plugins/internetradio/decoder_thread.cpp |
| 24 |
@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE |
| 25 |
|
| 26 |
//av_log_set_level(255); |
| 27 |
m_av_pFormatCtx = avformat_alloc_context(); |
| 28 |
- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); |
| 29 |
m_av_pFormatCtx->probesize = m_maxProbeSize; |
| 30 |
m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; |
| 31 |
|
| 32 |
@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE |
| 33 |
m_av_pFormatCtx_opened = true; |
| 34 |
} |
| 35 |
else { |
| 36 |
- |
| 37 |
// IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); |
| 38 |
if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { |
| 39 |
if (warningsNotErrors) { |
| 40 |
@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE |
| 41 |
m_av_audioStream = -1; |
| 42 |
for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { |
| 43 |
// if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { |
| 44 |
+#if LIBAVCODEC_VERSION_MAJOR < 53 |
| 45 |
if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream |
| 46 |
+#else |
| 47 |
+ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream |
| 48 |
+#endif |
| 49 |
m_av_audioStream = i; |
| 50 |
break; |
| 51 |
} |
Archives