Changeset eef284f3b6e266ffc7f82a2f447f74d5813afbc1

Show
Ignore:
Timestamp:
05/22/08 20:25:04 (4 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1211480704 +0200
git-parent:

[9298671dc006165c536e499e5721b7614d8ce829]

git-author:
Rafaël Carré <funman@videolan.org> 1211480676 +0200
Message:

Workaround f*cked up iTunes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/meta_engine/taglib.cpp

    r27d483e reef284f  
    125125 
    126126            psz_mime = p_apic->mimeType().toCString(true); 
     127            psz_description = psz_name = p_apic->description().toCString(true); 
    127128 
    128129            /* some old iTunes version not only sets incorrectly the mime type 
     130             * or the description of the image, 
    129131             * but also embeds incorrectly the image. 
    130132             * Recent versions seem to behave correctly */ 
    131             if( !strncmp( psz_mime, "PNG", 3 ) ) 
     133            if( !strncmp( psz_mime, "PNG", 3 ) || 
     134                !strncmp( psz_name, "\xC2\x89PNG", 5 ) ) 
    132135            { 
    133136                msg_Warn( p_demux, 
    134                     "%s: Invalid picture embedded by broken iTunes version", 
     137                    "%s: Invalid picture embedded by broken iTunes version, " 
     138                    "you really shouldn't use this crappy software.", 
    135139                    f.file()->name() ); 
    136140                break; 
    137141            } 
    138  
    139             psz_description = p_apic->description().toCString(true); 
    140             psz_name = psz_description; 
    141142 
    142143            p_data_taglib = p_apic->picture();