~greg.grossmeier/exempi/trunk

Viewing changes to XMPFiles/source/FormatSupport/ID3_Support.cpp

Committer: Hubert Figuière
Date: 2014-04-22 18:02:25 UTC
mfrom: (181.1.9)
Revision ID: git-v1:5013ac34dda98b65d8916eca1303488abaade995

Merge branch 'exempi-2.3-branch'

Conflicts:
        samples/source/common/LargeFileAccess.cpp
        source/XMPFiles/FileHandlers/MP3_Handler.cpp
        source/XMPFiles/FormatSupport/ID3_Support.hpp

files added:
m4/ax_cflags_gcc_option.m4

files modified:
NEWS

XMPFiles/source/FileHandlers/MP3_Handler.cpp

XMPFiles/source/FormatSupport/ID3_Support.cpp

configure.ac

exempi/tests/Makefile.am

exempi/tests/testcore.sh

Show diffs side-by-side

added added

removed removed

XMPFiles/source/FormatSupport/ID3_Support.cpp

440

441

void ID3v2Frame::release()

442

{

443

if ( this->content != 0 ) delete this->content;

443

if ( this->content != 0 ) delete [] this->content;

444

this->content = 0;

445

this->contentSize = 0;

446

}

Older »