head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.44
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.42
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.40
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.38
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.36
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.34
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.32
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.30
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.28
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.26
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.24
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.22
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.20
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.18
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.16
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.14
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.12
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.10
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.8
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.6
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.4
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.2
	pkgsrc-2020Q4-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2020.12.20.13.07.58;	author nia;	state Exp;
branches;
next	;
commitid	ZYkXp7yMPLzcYtAC;


desc
@@


1.1
log
@mp4v2: Revert amazing upstream commit that breaks all C users of libmp4v2

Bump PKGREVISION
@
text
@$NetBSD$

Fix building C applications.

Reverts the following commit:
https://github.com/TechSmith/mp4v2/commit/263719465a1c1fbe6d240b8d154da71003ce3230
https://github.com/TechSmith/mp4v2/issues/47

--- src/mp4.cpp.orig	2020-12-07 23:16:32.000000000 +0000
+++ src/mp4.cpp
@@@@ -87,7 +87,7 @@@@ const char* MP4GetFilename( MP4FileHandl
 
 ///////////////////////////////////////////////////////////////////////////////
 
-MP4FileHandle MP4Read( const char* fileName, ShouldParseAtomCallback cb/*=nullptr*/ )
+MP4FileHandle MP4Read( const char* fileName )
 {
     if (!fileName)
         return MP4_INVALID_FILE_HANDLE;
@@@@ -100,9 +100,6 @@@@ MP4FileHandle MP4Read( const char* fileN
     {
         ASSERT(pFile);
 
-        if ( cb != nullptr )
-           pFile->SetShouldParseAtomCallback( cb );
-
         pFile->Read( fileName, NULL );
         return (MP4FileHandle)pFile;
     }
@@@@ -149,6 +146,30 @@@@ MP4FileHandle MP4ReadProvider( const cha
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void MP4SetShouldParseAtomCallback( MP4FileHandle hFile, ShouldParseAtomCallback cb )
+{
+   if (!MP4_IS_VALID_FILE_HANDLE(hFile))
+      return;
+   try
+   {
+      ASSERT(hFile);
+      MP4File& file = *static_cast<MP4File*>(hFile);
+      file.SetShouldParseAtomCallback( cb );
+   }
+   catch( Exception* x ) {
+      mp4v2::impl::log.errorf(*x);
+      delete x;
+   }
+   catch( ... ) {
+      mp4v2::impl::log.errorf("%s: unknown exception accessing MP4File "
+                               "filename", __FUNCTION__ );
+   }
+
+//   g_parseCallback = cb;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
     MP4FileHandle MP4Create (const char* fileName,
                              uint32_t  flags)
     {
@