Sophie

Sophie

distrib > Mageia > 9 > x86_64 > by-pkgid > 877f303ae546d7064853958698c3d075 > files > 10

avidemux-2.8.1-11.mga9.tainted.src.rpm

From 3946881f61e8927b2139ef206d10bf80a1d82186 Mon Sep 17 00:00:00 2001
From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
Date: Tue, 11 Oct 2022 01:09:55 +0200
Subject: [PATCH 10/10] [coreVideoCodec,editor] Remove traces of an old unused
 hack

---
 avidemux/common/ADM_editor/include/ADM_edit.hxx   |  1 -
 avidemux/common/ADM_editor/src/ADM_edStub.cpp     | 15 ---------------
 .../ADM_coreVideoCodec/include/ADM_ffmp43.h       |  1 -
 3 files changed, 17 deletions(-)

diff --git a/avidemux/common/ADM_editor/include/ADM_edit.hxx b/avidemux/common/ADM_editor/include/ADM_edit.hxx
index 31f869d83..18b9560e4 100644
--- a/avidemux/common/ADM_editor/include/ADM_edit.hxx
+++ b/avidemux/common/ADM_editor/include/ADM_edit.hxx
@@ -281,7 +281,6 @@ private:
                     bool        getOpenGopDelayForSegment(uint32_t segNo, uint64_t segTime, uint32_t *delay, int *frameNo=NULL);
 public:
                     uint8_t	    updateVideoInfo(aviInfo *info);
-                    uint32_t 	getSpecificMpeg4Info( void );
                     bool        getNonClosedGopDelay(uint64_t time,uint32_t *delay);
                     bool        videoCopyPrepare(void);
                     bool        getUserDataUnregistered(uint64_t start,uint8_t *buffer,uint32_t max,uint32_t *length);
diff --git a/avidemux/common/ADM_editor/src/ADM_edStub.cpp b/avidemux/common/ADM_editor/src/ADM_edStub.cpp
index eeac0f5d6..1f7e0c416 100644
--- a/avidemux/common/ADM_editor/src/ADM_edStub.cpp
+++ b/avidemux/common/ADM_editor/src/ADM_edStub.cpp
@@ -30,21 +30,6 @@ uint32_t ref,refOffset;\
         ADM_warning(#func " cannot translate fame %" PRIi32"\n",frame); \
         return false; \
     }
-/**
-    \fn getSpecificMpeg4Info
-	Propagate this hack to the underlying decoder
-*/
-uint32_t ADM_Composer::getSpecificMpeg4Info( void )
-{
-	if(_segments.getNbSegments())
-    {
- //       _VIDEOS *vid=_segments.getRefVideo(0);
-//		if(vid->decoder)
-//	 		return vid->decoder->getSpecificMpeg4Info();
-    }
-	return 0;
-
-}
 
 /**
     \fn updateVideoInfo
diff --git a/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h b/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
index f4606674e..15372995e 100644
--- a/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
+++ b/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
@@ -124,7 +124,6 @@ public:
         }
         virtual bool decodeHeaderOnly (void);
         virtual bool decodeFull (void);
-      //  virtual uint32_t getSpecificMpeg4Info (void);
         virtual uint32_t getPARWidth (void);
         virtual uint32_t getPARHeight (void);
         virtual bool decodeErrorHandler(int code);
-- 
2.30.4