Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/strigi/patches/strigi-0.7.5-ffmpeg.patch

    Diff of /trunk/strigi/patches/strigi-0.7.5-ffmpeg.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1489 by niro, Sat Aug 6 17:09:48 2011 UTC revision 1490 by niro, Sat Aug 6 17:15:49 2011 UTC
    # Line 1  Line 1 
    1  From: Tirtha Chatterjee <tirtha.p.chatterjee@gmail.com>  diff -Naur strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp strigi-0.7.5-magellan/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
    2  Date: Tue, 21 Jun 2011 19:16:55 +0000  --- strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-06-02 11:29:26.000000000 +0200
    3  Subject: used the new API of ffmpeg, fixes a build issue with ffmpeg from git.  +++ strigi-0.7.5-magellan/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-08-06 20:49:37.000000000 +0200
    4  X-Git-Tag: v0.7.6  @@ -348,7 +348,7 @@
     X-Git-Url: http://quickgit.kde.org/?p=libstreamanalyzer.git&amp;a=commitdiff&amp;h=4cfbe1fe673b48797bbea0b98c81d7ccf05a1d72  
     ---  
     used the new API of ffmpeg, fixes a build issue with ffmpeg from git.  
     ---  
       
       
     --- a/plugins/endplugins/ffmpegendanalyzer.cpp  
     +++ b/plugins/endplugins/ffmpegendanalyzer.cpp  
     @@ -348,7 +348,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul  
    5       if ((size = in->size()) >= 0)       if ((size = in->size()) >= 0)
    6         ar.addValue(factory->durationProperty, (uint32_t)(size/(fc->bit_rate/8)));         ar.addValue(factory->durationProperty, (uint32_t)(size/(fc->bit_rate/8)));
    7     }     }
    # Line 19  used the new API of ffmpeg, fixes a buil Line 10  used the new API of ffmpeg, fixes a buil
    10       ar.addValue(factory->typeProperty, NFO "Audio");       ar.addValue(factory->typeProperty, NFO "Audio");
    11       ar.addValue(factory->typeProperty, NMM_DRAFT "MusicPiece");       ar.addValue(factory->typeProperty, NMM_DRAFT "MusicPiece");
    12     } else {     } else {
    13  @@ -359,7 +359,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul  @@ -359,7 +359,7 @@
    14       const AVStream &stream = *fc->streams[i];       const AVStream &stream = *fc->streams[i];
    15       const AVCodecContext &codec = *stream.codec;       const AVCodecContext &codec = *stream.codec;
    16            
    # Line 28  used the new API of ffmpeg, fixes a buil Line 19  used the new API of ffmpeg, fixes a buil
    19         const string streamuri = ar.newAnonymousUri();         const string streamuri = ar.newAnonymousUri();
    20         ar.addValue(factory->hasPartProperty, streamuri);         ar.addValue(factory->hasPartProperty, streamuri);
    21         ar.addTriplet(streamuri, partOfPropertyName, ar.path());         ar.addTriplet(streamuri, partOfPropertyName, ar.path());
    22  @@ -370,8 +370,16 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul  @@ -370,8 +370,16 @@
    23           outs << (stream.duration * stream.time_base.num / stream.time_base.den);           outs << (stream.duration * stream.time_base.num / stream.time_base.den);
    24           ar.addTriplet(streamuri, durationPropertyName,outs.str());           ar.addTriplet(streamuri, durationPropertyName,outs.str());
    25         }         }
    # Line 47  used the new API of ffmpeg, fixes a buil Line 38  used the new API of ffmpeg, fixes a buil
    38         }         }
    39         const AVCodec *p = avcodec_find_decoder(codec.codec_id);         const AVCodec *p = avcodec_find_decoder(codec.codec_id);
    40         if (p) {         if (p) {
    41  @@ -408,7 +416,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul  @@ -408,7 +416,7 @@
    42           ar.addTriplet(streamuri, bitratePropertyName, outs.str());           ar.addTriplet(streamuri, bitratePropertyName, outs.str());
    43         }         }
    44    
    # Line 56  used the new API of ffmpeg, fixes a buil Line 47  used the new API of ffmpeg, fixes a buil
    47                    
    48           ar.addTriplet(streamuri, typePropertyName, audioClassName);           ar.addTriplet(streamuri, typePropertyName, audioClassName);
    49           if (codec.channels) {           if (codec.channels) {
    50  @@ -458,36 +466,107 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul  @@ -458,36 +466,107 @@
    51     }     }
    52    
    53     // Tags     // Tags
    # Line 190  used the new API of ffmpeg, fixes a buil Line 181  used the new API of ffmpeg, fixes a buil
    181     }     }
    182    
    183     av_close_input_stream(fc);     av_close_input_stream(fc);
       
    Legend:
    Removed from v.1489  
    changed lines
      Added in v.1490