diff options
| author | Michael Landin <mich@FreeBSD.org> | 2007-10-14 18:58:37 +0000 |
|---|---|---|
| committer | Michael Landin <mich@FreeBSD.org> | 2007-10-14 18:58:37 +0000 |
| commit | 29561e058801aa926e2c9ea5c8b6836c550596cd (patch) | |
| tree | f46ce419a6e2be3dd3f63e5327e5bdaf9a345839 /audio | |
| parent | update to 4.2.1 (diff) | |
- fix breakage from lastest mpeg4ip-libmp4v2
PR: ports/116972
Submitted by: Armin Pirkovitsch <a.pirko@inode.at>
Notes
Notes:
svn path=/head/; revision=201473
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp | 15 | ||||
| -rw-r--r-- | audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp | 15 |
2 files changed, 28 insertions, 2 deletions
diff --git a/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp b/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp index 35000f132539..181d18e156a0 100644 --- a/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp +++ b/audio/amarok-kde4/files/patch-amarok_src_metadata_mp4_mp4file.cpp @@ -3,7 +3,7 @@ $FreeBSD$ --- amarok/src/metadata/mp4/mp4file.cpp.orig +++ amarok/src/metadata/mp4/mp4file.cpp -@@ -23,9 +23,8 @@ +@@ -27,9 +27,8 @@ #include "mp4tag.h" #include <tfile.h> @@ -14,3 +14,16 @@ $FreeBSD$ #define MP4V2_HAS_WRITE_BUG 1 +@@ -156,10 +155,8 @@ + } + #endif + +- if(!MP4Close(handle)) +- { +- fprintf(stderr, "close failed\n"); +- } ++ MP4Close(handle); ++ handle=NULL; + + mp4file = MP4Read(name()); + if(mp4file == MP4_INVALID_FILE_HANDLE) diff --git a/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp b/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp index 35000f132539..181d18e156a0 100644 --- a/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp +++ b/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp @@ -3,7 +3,7 @@ $FreeBSD$ --- amarok/src/metadata/mp4/mp4file.cpp.orig +++ amarok/src/metadata/mp4/mp4file.cpp -@@ -23,9 +23,8 @@ +@@ -27,9 +27,8 @@ #include "mp4tag.h" #include <tfile.h> @@ -14,3 +14,16 @@ $FreeBSD$ #define MP4V2_HAS_WRITE_BUG 1 +@@ -156,10 +155,8 @@ + } + #endif + +- if(!MP4Close(handle)) +- { +- fprintf(stderr, "close failed\n"); +- } ++ MP4Close(handle); ++ handle=NULL; + + mp4file = MP4Read(name()); + if(mp4file == MP4_INVALID_FILE_HANDLE) |