Request 340 (accepted)

Overview

Request 340 (accepted)

- Add fix-transcoding.patch - fixes #PM-57.

Created by Fisiu over 10 years ago
In state accepted

Submit amarok

Submit package home:Fisiu:branches:Essentials / amarok to package Essentials / amarok

amarok.changes Changed

amarok.spec Changed

fix-transcoding.patch Added

@@ -0,0 +1,66 @@
+Index: src/core/transcoding/formats/TranscodingAacFormat.cpp
+===================================================================
+--- src/core/transcoding/formats/TranscodingAacFormat.cpp.orig
++++ src/core/transcoding/formats/TranscodingAacFormat.cpp
+@@ -90,7 +90,7 @@ QStringList
+ AacFormat::ffmpegParameters( const Configuration &configuration ) const
+ {
+     QStringList parameters;
+-    parameters << "-acodec" << "libfaac"; /* libfaac seems to be the only decent AAC encoder
++    parameters << "-acodec" << "aac"; /* libfaac seems to be the only decent AAC encoder
+                                              for GNU/Linux and it's a proprietary freeware
+                                              with LGPL portions. Hopefully in the future
+                                              FFmpeg's native aac implementation should get
+@@ -114,7 +114,7 @@ AacFormat::ffmpegParameters( const Confi
+ bool
+ AacFormat::verifyAvailability( const QString &ffmpegOutput ) const
+ {
+-    return ffmpegOutput.contains( QRegExp( ".EA... libfaac" ) );
++    return ffmpegOutput.contains( QRegExp( ".EA... aac" ) );
+ }
+ 
+ }
+Index: src/core/transcoding/formats/TranscodingMp3Format.cpp
+===================================================================
+--- src/core/transcoding/formats/TranscodingMp3Format.cpp.orig
++++ src/core/transcoding/formats/TranscodingMp3Format.cpp
+@@ -85,7 +85,7 @@ QStringList
+ Mp3Format::ffmpegParameters( const Configuration &configuration ) const
+ {
+     QStringList parameters;
+-    parameters << "-acodec" << "libmp3lame";
++    parameters << "-acodec" << "mp3";
+     foreach( Property property, m_propertyList )
+     {
+         if( !configuration.property( property.name() ).isNull()
+@@ -105,7 +105,7 @@ Mp3Format::ffmpegParameters( const Confi
+ bool
+ Mp3Format::verifyAvailability( const QString &ffmpegOutput ) const
+ {
+-    return ffmpegOutput.contains( QRegExp( ".EA... libmp3lame" ) );
++    return ffmpegOutput.contains( QRegExp( ".EA... mp3" ) );
+ }
+ 
+ }
+Index: src/core/transcoding/formats/TranscodingVorbisFormat.cpp
+===================================================================
+--- src/core/transcoding/formats/TranscodingVorbisFormat.cpp.orig
++++ src/core/transcoding/formats/TranscodingVorbisFormat.cpp
+@@ -90,7 +90,7 @@ QStringList
+ VorbisFormat::ffmpegParameters( const Configuration &configuration ) const
+ {
+     QStringList parameters;
+-    parameters << "-acodec" << "libvorbis";   //libvorbis is better than FFmpeg's
++    parameters << "-acodec" << "vorbis";   //libvorbis is better than FFmpeg's
+                                               //vorbis implementation in many ways
+     foreach( Property property, m_propertyList )
+     {
+@@ -111,7 +111,7 @@ VorbisFormat::ffmpegParameters( const Co
+ bool
+ VorbisFormat::verifyAvailability( const QString &ffmpegOutput ) const
+ {
+-    return ffmpegOutput.contains( QRegExp( ".EA... libvorbis" ) );
++    return ffmpegOutput.contains( QRegExp( ".EA... vorbis" ) );
+ }
+ 
+ }

Build Results
RPM Lint

Refresh

Comments for request 340 0

Request History

Fisiu created request over 10 years ago

- Add fix-transcoding.patch - fixes #PM-57.

mrdocs accepted request over 11 years ago

Reviewed OK