diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-06-13 03:32:43 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-06-13 03:32:43 +0000 |
| commit | 7e09f60de209854be61271fce0f96f79f60df860 (patch) | |
| tree | 21e1197bfb3dfa22572dc9d4ac821b15ef4188d2 /media-libs/faad2/files | |
| parent | Version bump. Closing bug #51236. (Manifest recommit) (diff) | |
| download | gentoo-2-7e09f60de209854be61271fce0f96f79f60df860.tar.gz gentoo-2-7e09f60de209854be61271fce0f96f79f60df860.tar.bz2 gentoo-2-7e09f60de209854be61271fce0f96f79f60df860.zip | |
new gcc 3.4 patch that should fix bug #50024
Diffstat (limited to 'media-libs/faad2/files')
| -rw-r--r-- | media-libs/faad2/files/faad2-2.0-gcc34.patch | 54 |
1 files changed, 8 insertions, 46 deletions
diff --git a/media-libs/faad2/files/faad2-2.0-gcc34.patch b/media-libs/faad2/files/faad2-2.0-gcc34.patch index c56f4dca49f9..fe11002a1116 100644 --- a/media-libs/faad2/files/faad2-2.0-gcc34.patch +++ b/media-libs/faad2/files/faad2-2.0-gcc34.patch @@ -1,48 +1,10 @@ ---- common/mp4v2/mp4property.h.old 2003-06-29 22:41:00.000000000 +0100 -+++ common/mp4v2/mp4property.h 2004-04-23 18:33:37.751587448 +0100 -@@ -58,7 +58,7 @@ - return m_name; - } +--- faad2/common/mp4v2/mp4property.h 2004-04-14 20:53:58.582017392 -0400 ++++ faad2/common/mp4v2/mp4property_.h 2004-04-14 20:51:21.955828192 -0400 +@@ -21,6 +21,7 @@ -- virtual MP4PropertyType GetType() = NULL; -+ virtual MP4PropertyType GetType(const char *name = NULL); - - bool IsReadOnly() { - return m_readOnly; -@@ -74,17 +74,18 @@ - m_implicit = value; - } - -- virtual u_int32_t GetCount() = NULL; -- virtual void SetCount(u_int32_t count) = NULL; -+ virtual u_int32_t GetCount(const char *name = NULL); -+ -+ virtual void SetCount(u_int32_t count, const char *name = NULL); - - virtual void Generate() { /* default is a no-op */ }; - -- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Read(MP4File* pFile, u_int32_t index = 0, const char *name = NULL); - -- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Write(MP4File* pFile, u_int32_t index = 0, const char *name = NULL); - - virtual void Dump(FILE* pFile, u_int8_t indent, -- bool dumpImplicits, u_int32_t index = 0) = NULL; -+ bool dumpImplicits, u_int32_t index = 0, const char *name = NULL); - - virtual bool FindProperty(const char* name, - MP4Property** ppProperty, u_int32_t* pIndex = NULL); ---- common/mp4v2/rtphint.h.old 2003-06-29 22:41:00.000000000 +0100 -+++ common/mp4v2/rtphint.h 2004-04-23 18:33:37.751587448 +0100 -@@ -35,8 +35,8 @@ - return m_pPacket; - } - -- virtual u_int16_t GetDataSize() = NULL; -- virtual void GetData(u_int8_t* pDest) = NULL; -+ virtual u_int16_t GetDataSize(const char *name = NULL); -+ virtual void GetData(u_int8_t* pDest, const char *name = NULL); - - MP4Track* FindTrackFromRefIndex(u_int8_t refIndex); + #ifndef __MP4_PROPERTY_INCLUDED__ + #define __MP4_PROPERTY_INCLUDED__ ++#define NULL 0 + // forward declarations + class MP4Atom; |