Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libmediainfo/files: libmediainfo-0.7.44-libmms.patch
Date: Wed, 01 Jun 2011 08:25:12
Message-Id: 20110601082459.7B1AF20057@flycatcher.gentoo.org
1 radhermit 11/06/01 08:24:59
2
3 Added: libmediainfo-0.7.44-libmms.patch
4 Log:
5 Fix build with libmms (bug #366383).
6
7 (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmediainfo/files/libmediainfo-0.7.44-libmms.patch?rev=1.1&content-type=text/plain
14
15 Index: libmediainfo-0.7.44-libmms.patch
16 ===================================================================
17 --- MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp
18 +++ MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp
19 @@ -37,10 +37,8 @@
20 #else
21 #ifdef MEDIAINFO_LIBMMS_FROMSOURCE
22 #include "mmsx.h"
23 - #include "mmsh.h"
24 #else //MEDIAINFO_LIBMMS_FROMSOURCE
25 #include "libmms/mmsx.h"
26 - #include "libmms/mmsh.h"
27 #endif //MEDIAINFO_LIBMMS_FROMSOURCE
28 #endif
29 using namespace ZenLib;
30 @@ -59,30 +57,10 @@
31 //---------------------------------------------------------------------------
32 size_t Reader_libmms::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
33 {
34 - mmsx_t* Handle;
35 //Opening the file
36 - if (!MI->Config.File_Mmsh_Describe_Only_Get())
37 - {
38 - // Use MMS or MMSH (Send a DESCRIBE & PLAY request)
39 - Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
40 - if (Handle==NULL)
41 - return 0;
42 - }
43 - else
44 - {
45 - // Use MMSH & Send a DESCRIBE request
46 - mmsh_t* MmshHandle;
47 -
48 - MmshHandle = mmsh_describe_request(0, 0, Ztring(File_Name).To_Local().c_str());
49 - if(MmshHandle==NULL)
50 - return 0;
51 -
52 - Handle=mmsx_set_mmsh_handle(MmshHandle);
53 - if (Handle==NULL) {
54 - mmsh_close(MmshHandle);
55 - return 0;
56 - }
57 - }
58 + mmsx_t* Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
59 + if (Handle==NULL)
60 + return 0;
61
62 mms_off_t Offset=mmsx_seek(0, Handle, 0, SEEK_SET);
63 uint32_t Length=mmsx_get_length(Handle);