Request 6588 (accepted)

avidemux3.changes Changed

avidemux3.spec Changed

@@ -19,7 +19,7 @@
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
 License:        GPL-2.0-only
-Version:        2.8.2.git20260910
+Version:        2.8.2.git20260915
 Release:        0
 URL:            https://github.com/mean00/avidemux2
 ExclusiveArch:  %ix86 x86_64
@@ -42,9 +42,11 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  pkg-config
+BuildRequires:  nasm
 BuildRequires:  qt6-tools
 BuildRequires:  qt6-tools-linguist
 BuildRequires:  yasm
+BuildRequires:  nasm
 BuildRequires:  pkgconfig(vapoursynth)
 # VapourSynth has removed support for VSScript API3, breaking Avidemux build.
 # Disable VapourSynth if it is too recent.
@@ -55,6 +57,7 @@
 BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(sdl3)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(xmu)
 
@@ -97,6 +100,7 @@
 BuildRequires:  pkgconfig(x265)
 
 # GUI
+BuildRequires:  cmake(Qt6GuiPrivate)
 BuildRequires:  pkgconfig(Qt6Core)
 BuildRequires:  pkgconfig(Qt6Gui)
 BuildRequires:  pkgconfig(Qt6Network)
@@ -224,7 +228,6 @@
 %{_libdir}/libADM6avcodec.so.*
 %{_libdir}/libADM6avformat.so.*
 %{_libdir}/libADM6avutil.so.*
-%{_libdir}/libADM6postproc.so.*
 %{_libdir}/libADM6swscale.so.*
 %{_libdir}/libADM_audioParser6.so
 %{_libdir}/libADM_core6.so
@@ -376,7 +379,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mean.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_median.so

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/ffmpeg-7.0.2.tar.bz2 Deleted

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_editor/src/ADM_edRender.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_editor/src/ADM_edRender.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_editor/src/ADM_edRenderInternal.cpp Changed

@@ -28,7 +28,9 @@
 #define aprintf(...) {}// printf
 #endif
 
+#ifdef USE_LIBPOSTPROC
 #include "ADM_pp.h"
+#endif
 
 /**
     \fn seektoFrame
@@ -278,7 +280,14 @@
             img.demuxerPts,
             img.demuxerPts/1000);
     }
-    if(!decompressImage(result,&img,ref))
+    bool success = decompressImage(result,&img,ref);
+    // Handle libavcodec issue that both avcodec_send_packet()
+    // and subsequent avcodec_receive_frame() may return EAGAIN.
+    // In this case, retry with the same compressed image just once.
+    if (!success && vid->decoder->getSendAgain())
+        success = decompressImage(result,&img,ref);
+
+    if (!success)
     {
         if(false==vid->decoder->keepFeeding())
             ADM_info("Error decoding frame %" PRIu32"\n",frame);
@@ -339,7 +348,7 @@
         if(vid->lastDecodedPts > vid->firstFramePts)
         {
             stats.nbPtsgoingBack++;
-            ADM_warning(">>>>> PTS going backward by %" PRId64" ms\n",(old-vid->lastDecodedPts)/1000);
+            ADM_warning(">>>>> PTS going backward by %" PRId64" us\n",old-vid->lastDecodedPts);
             ADM_warning("Dropping frame!\n");
         }
         cache->invalidate(result);
@@ -453,6 +462,9 @@
         aprintf("decompressImage : hw pic\n");
         return true;
     }
+
+    dupe(tmpImage, out, v);
+#ifdef USE_LIBPOSTPROC
     // Do postprocessing if any
     // Pp deactivated ?
     if(!_pp->postProcType || (!(_pp->postProcType & ADM_POSTPROC_DEINT) && !_pp->postProcStrength) || tmpImage->_pixfrmt != ADM_PIXFRMT_YV12)
@@ -465,6 +477,7 @@
     out->copyInfo(tmpImage);
     /* Do it!*/
     _pp->process(tmpImage,out);
+#endif
     return true;
 }
 //#define EDITOR_DEBUG_FRAME_TYPE
@@ -605,7 +618,10 @@
         }
         aprintf("Decoder Demuxer Frame %" PRIu32" pts=%" PRIu64" ms, %" PRIu64" us\n",vid->lastSentFrame,img.demuxerPts/1000,
                                                                     img.demuxerPts);
-        if(!decompressImage(result,&img,ref))
+        bool success = decompressImage(result,&img,ref);
+        if (!success && vid->decoder->getSendAgain())
+            success = decompressImage(result,&img,ref);
+        if (!success)
         {
             cache->invalidate(result);
             //cache->dump();

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_nvdec.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_nvdec.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

@@ -312,12 +312,13 @@
 bool decoderFFVDPAU::initVdpContext()
 {
     _context->slice_flags = SLICE_FLAG_CODED_ORDER | SLICE_FLAG_ALLOW_FIELD;
+#if 0
     AVVDPAUContext *v = av_alloc_vdpaucontext();
     ;
     _context->hwaccel_context = v;
     v->render = NULL;
     v->decoder = VDP_INVALID_HANDLE;
-
+#endif
     if (0 > av_vdpau_bind_context(_context, (VdpDevice)(uint64_t)admVdpau::getVdpDevice(), vdpGetProcAddressWrapper,
                                   AV_HWACCEL_FLAG_IGNORE_LEVEL))
     {
@@ -447,12 +448,13 @@
             pkt->flags = 0;
 
         ret = avcodec_send_packet(_context, pkt);
-        if (ret)
+        if (ret && ret != AVERROR(EAGAIN))
         {
             char erAV_ERROR_MAX_STRING_SIZE = {0};
             av_make_error_string(er, AV_ERROR_MAX_STRING_SIZE, ret);
             ADM_warning("Ignoring error %d submitting packet to decoder (\"%s\")\n", ret, er);
         }
+        _parent->setSendAgain(ret == AVERROR(EAGAIN));
         av_packet_unref(pkt);
     }
     else

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_videotoolbox.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/A_functions.h -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/A_functions.h Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/gui_action.names -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/gui_action.names Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/gui_main.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/gui_main.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/common/gui_navigate.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/common/gui_navigate.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/qt4/ADM_commonUI/DIA_prefs.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/qt4/ADM_commonUI/DIA_prefs.cpp Changed

@@ -15,7 +15,10 @@
 #include "ADM_default.h"
 #include "config.h"
 
+#ifdef USE_LIBPOSTPROC
 #include "ADM_pp.h"
+#endif
+
 #include "ADM_qtx.h"
 #include "GUI_render.h"
 #include "audio_out.h"
@@ -91,9 +94,10 @@
     bool swapUpDown = false;
     bool swapWheel = false;
 
+#ifdef USE_LIBPOSTPROC
     uint32_t pp_type = 3;
     uint32_t pp_value = 5;
-
+#endif
     bool useCustomFragmentSize = false;
     uint32_t customFragmentSize = 4000;
     bool loadPicsInReverseOrder = false;
@@ -155,6 +159,7 @@
     prefs->get(FEATURES_CAP_REFRESH_ENABLED, &refreshCapEnabled);
     prefs->get(FEATURES_CAP_REFRESH_VALUE, &refreshCapValue);
 
+#ifdef USE_LIBPOSTPROC
     // Default pp
     if (!prefs->get(DEFAULT_POSTPROC_TYPE, &pp_type))
         pp_type = 0;
@@ -165,7 +170,7 @@
     DOME(ADM_POSTPROC_HORIZ_DEBLOCK, hzd)
     DOME(ADM_POSTPROC_VERT_DEBLOCK, vzd)
     DOME(ADM_POSTPROC_DERING, dring)
-
+#endif
 // Cpu caps
 #define CPU_CAPS(x)                                                                                                    \
     if ((cpuCaps & cpuMask) & ADM_CPUCAP_##x)                                                                          \
@@ -682,6 +687,7 @@
 #endif
 
     /* Post-Processing */
+#ifdef USE_LIBPOSTPROC
     diaElemToggle fhzd(&hzd, QT_TRANSLATE_NOOP("adm", "_Horizontal deblocking"));
     diaElemToggle fvzd(&vzd, QT_TRANSLATE_NOOP("adm", "_Vertical deblocking"));
     diaElemToggle fdring(&dring, QT_TRANSLATE_NOOP("adm", "De_ringing"));
@@ -692,7 +698,7 @@
     framePP.swallow(&fvzd);
     framePP.swallow(&fdring);
     framePP.swallow(&postProcStrength);
-
+#endif
     // HDR
     diaMenuEntry toneMapEntries = {
         {0, QT_TRANSLATE_NOOP("adm", "Disabled"), NULL},
@@ -719,7 +725,12 @@
     frameHDR.swallow(&menuOutOfGamutHDR);
     frameHDR.swallow(&floatTargetLumHDR);
 
-    diaElem *diaPostProc = {&framePP, &frameHDR};
+    diaElem *diaPostProc = {
+#ifdef USE_LIBPOSTPROC
+        &framePP,
+#endif
+        &frameHDR
+    };
     diaElemTabs tabPostProc(QT_TRANSLATE_NOOP("adm", "Post-Processing"), NB_ELEM(diaPostProc), diaPostProc);
 
     /* Display */
@@ -888,7 +899,7 @@
         //
         prefs->set(FEATURES_CAP_REFRESH_ENABLED, refreshCapEnabled);
         prefs->set(FEATURES_CAP_REFRESH_VALUE, refreshCapValue);
-
+#ifdef USE_LIBPOSTPROC
 // Postproc
 #undef DOME
 #define DOME(x, y)                                                                                                     \
@@ -900,7 +911,7 @@
         DOME(ADM_POSTPROC_DERING, dring)
         prefs->set(DEFAULT_POSTPROC_TYPE, pp_type);
         prefs->set(DEFAULT_POSTPROC_VALUE, pp_value);
-
+#endif
         // Alsa
 #ifdef ALSA_SUPPORT
         if (alsaDevice)

avidemux2-2.8.2.git20260910.tar.xz/avidemux/qt4/ADM_commonUI/myOwnMenu.h -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/qt4/ADM_commonUI/myOwnMenu.h Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux/qt4/CMakeLists.txt -> avidemux2-2.8.2.git20260915.tar.xz/avidemux/qt4/CMakeLists.txt Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreImage/src/CMakeLists.txt -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreImage/src/CMakeLists.txt Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

@@ -966,7 +966,8 @@
 
     // duplicate
     int myLen=len+AV_INPUT_BUFFER_PADDING_SIZE;
-    uint8_t *myData=new uint8_tmyLen;
+    uint8_t *myData = (uint8_t *)av_malloc(myLen);
+    ADM_assert(myData);
     memset(myData,0x2,myLen);
     memcpy(myData,data,len);
     myDatalen=0; // stop ff_h264_decode_extradata() from trying to parse the remaining buffer content as PPS
@@ -976,6 +977,7 @@
     AVCodecContext *ctx=NULL;
     const AVCodec *codec=NULL;
     uint8_t *d=NULL;
+    int ticksPerFrame = 1;
 
     if(!parser)
     {
@@ -996,10 +998,12 @@
         ADM_error("cannot create h264 context\n");
         goto theEnd;
     }
-
-    ADM_info("Context created, ticks_per_frame = %d\n",ctx->ticks_per_frame);
+    if (ctx->codec_descriptor && (ctx->codec_descriptor->props & AV_CODEC_PROP_FIELDS))
+        ticksPerFrame = 2;
+    ADM_info("Context created, ticks per frame: %d\n", ticksPerFrame);
     //2- Parse, let's add SPS prefix + Filler postfix to make life easier for libavcodec parser
     ctx->extradata=myData;
+    myData = NULL; // will be freed by avcodec_free_context()
     ctx->extradata_size=len;
      {
          uint8_t *outptr=NULL;
@@ -1018,7 +1022,13 @@
     //ADM_info("Height : %d\n",ctx->height);
     {
         ffSpsInfo nfo;
-        if(!ff_h264_info(parser,ctx->ticks_per_frame,&nfo))
+        ticksPerFrame = 1;
+        if (ctx->codec_descriptor)
+        {
+            if (ctx->codec_descriptor->props & AV_CODEC_PROP_FIELDS)
+                ticksPerFrame = 2;
+        }
+        if(!ff_h264_info(parser, ticksPerFrame, &nfo))
         {
             ADM_error("Cannot get sps info from lavcodec\n");
             r=false;
@@ -1043,16 +1053,12 @@
      }
     // cleanup
 theEnd:
-    if(ctx)
-    {
-        avcodec_close(ctx);
-
-        av_free(ctx);
-    }
+    avcodec_free_context(&ctx);
     if(parser)
         av_parser_close(parser);
 
-    delete  myData;
+    if (myData)
+        av_freep(&myData);
 
     return r;
 }

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp Changed

@@ -30,8 +30,8 @@
 extern "C"
 {
 #include "libavcodec/parser.h"
-#include "libavcodec/hevc.h"
-#include "libavcodec/hevc_ps.h"
+#include "libavcodec/hevc/hevc.h"
+#include "libavcodec/hevc/ps.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/ff_spsinfo.h"
 #include "libavutil/mem.h"
@@ -71,7 +71,8 @@
     originalLength=len;
 #define NAL_H265_CRA_NUT_LENGTH 10
     myLen=len+AV_INPUT_BUFFER_PADDING_SIZE+NAL_H265_CRA_NUT_LENGTH;
-    myData=new uint8_tmyLen;
+    myData = (uint8_t *)av_malloc(myLen);
+    ADM_assert(myData);
     memset(myData,0,myLen);
     memcpy(myData,data,len);
     parser=NULL;
@@ -80,24 +81,14 @@
 }
 H265Parser::~H265Parser()
 {
-    if(myData)
-    {
-        delete  myData;
-        myData=NULL;
-    }
-    //-
-    if(ctx)
-    {
-        avcodec_close(ctx);
-        av_free(ctx);
-        ctx=NULL;
-    }    
+    avcodec_free_context(&ctx);
     if(parser)
     {
         av_parser_close(parser);
         parser=NULL;
     }
-    
+    if (myData)
+        av_freep(&myData);
 }
 
 bool H265Parser::init()
@@ -159,12 +150,13 @@
         spsinfo->height=sps->height-ow->top_offset-ow->bottom_offset;
         spsinfo->fps1000=23976;
         spsinfo->log2_max_poc_lsb=sps->log2_max_poc_lsb;
-        spsinfo->separate_colour_plane_flag=sps->separate_colour_plane_flag;
         spsinfo->dependent_slice_segments_enabled_flag=0;
         spsinfo->address_coding_length=bitsNeeded(sps->ctb_width*sps->ctb_height);
         printf("VPS = %d  x %d ** %d\n",sps->ctb_width,sps->ctb_height, sps->ctb_size);
         uint32_t timeBaseNum=0;
         uint32_t timeBaseDen=0;
+        if(vps)
+            spsinfo->separate_colour_plane_flag = vps->rep_format.separate_colour_plane_flag;
         if(vps && vps->vps_timing_info_present_flag)
         {
             printf("VPS timescale = %u\n",vps->vps_time_scale);
@@ -215,6 +207,7 @@
     int outsize=0;
 
     ctx->extradata=myData;
+    myData = NULL; // will be freed in dtor by avcodec_free_context()
     ctx->extradata_size=myLen;
     // no use to evaluate the return value, it will be always 0
     av_parser_parse2(parser, ctx, &outptr, &outsize, NULL, 0, 0, 0,0);
@@ -227,7 +220,7 @@
  */
 bool H265Parser::parseAnnexB(ADM_SPSinfoH265 *spsinfo)
 {
-    
+    ADM_assert(myData);
     uint8_t *start=myData;
     int   toConsume=myLen;
 #if 1

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreVideoCodec/include/ADM_codec.h Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffHwAccel.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/cmake/admFFmpegBuild_crossMingw.cmake -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/cmake/admFFmpegBuild_crossMingw.cmake Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/cmake/admFFmpegBuild_helpers.cmake -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/cmake/admFFmpegBuild_helpers.cmake Changed

@@ -7,6 +7,11 @@
   ENDIF()
 ENDMACRO()
 INCLUDE(admFFmpegVersion)
+
+IF(${FFMPEG_VERSION} VERSION_LESS "7.1")
+  SET(USE_LIBPOSTPROC True)
+ENDIF()
+
 OPTION(FF_INHERIT_BUILD_ENV "" ON)
 FIND_PACKAGE(Patch)
 
@@ -43,9 +48,12 @@
 #
 #
 MACRO(ADM_FF_SET_DEFAULT)
-  xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
+  xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-gpl")
   xadd("--enable-runtime-cpudetect --disable-network ")
   xadd("--enable-swscale --disable-swresample")
+  IF(USE_LIBPOSTPROC)
+    xadd("--enable-postproc")
+  ENDIF()
   xadd("--disable-doc --disable-programs")
 
   FIND_HEADER_AND_LIB(_X265 x265.h)
@@ -171,7 +179,9 @@
   SET(FF_SHORT_INSTALL_DIR ${AVIDEMUX_INSTALL_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR})
 
   ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}")
-  ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
+  IF(USE_LIBPOSTPROC)
+    ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
+  ENDIF()
   ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}")
   ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
   ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
@@ -233,9 +243,11 @@
             DESTINATION "${FF_SHORT_INSTALL_DIR}/libavutil"
             COMPONENT dev)
 
-  INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h"   DESTINATION "${FF_SHORT_INSTALL_DIR}/libpostproc" COMPONENT dev)
-  INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h"       DESTINATION "${FF_SHORT_INSTALL_DIR}/libpostproc" COMPONENT dev)
-  INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version_major.h" DESTINATION "${FF_SHORT_INSTALL_DIR}/libpostproc" COMPONENT dev)
+  IF(USE_LIBPOSTPROC)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/postprocess.h"   DESTINATION "${FF_SHORT_INSTALL_DIR}/libpostproc" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version.h"       DESTINATION "${FF_SHORT_INSTALL_DIR}/libpostproc" COMPONENT dev)
+    INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libpostproc/version_major.h" DESTINATION "${FF_SHORT_INSTALL_DIR}/libpostproc" COMPONENT dev)
+  ENDIF()
   INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/swscale.h"        DESTINATION "${FF_SHORT_INSTALL_DIR}/libswscale" COMPONENT dev)
   INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version.h"        DESTINATION "${FF_SHORT_INSTALL_DIR}/libswscale" COMPONENT dev)
   INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libswscale/version_major.h"  DESTINATION "${FF_SHORT_INSTALL_DIR}/libswscale" COMPONENT dev)

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/cmake/admFFmpegBuild_native.cmake -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/cmake/admFFmpegBuild_native.cmake Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/cmake/admFFmpegBuild_vs.cmake -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/cmake/admFFmpegBuild_vs.cmake Changed

@@ -50,13 +50,19 @@
 #@@
 ADM_FF_BUILD_UNIX_STYLE()
 
-ADD_CUSTOM_COMMAND(OUTPUT
+LIST(APPEND FFMPEG_OUTPUT_DIRS
   "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}"
   "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}"
   "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}"
-  "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}"
   "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}"
   "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
+)
+IF(USE_LIBPOSTPROC)
+  LIST(APPEND FFMPEG_OUTPUT_DIRS "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
+ENDIF()
+
+ADD_CUSTOM_COMMAND(OUTPUT
+  ${FFMPEG_OUTPUT_DIRS}
   COMMAND ${BASH_EXECUTABLE} ffmpeg_make.sh WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
 
 
@@ -66,8 +72,10 @@
 ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_ADM}avcodec-${LIBAVCODEC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavformat/${LIBAVCODEC_ADM}avformat-${LIBAVFORMAT_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libavutil/${LIBAVCODEC_ADM}avutil-${LIBAVUTIL_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBAVCODEC_ADM}postproc-${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libswscale/${LIBAVCODEC_ADM}swscale-${LIBSWSCALE_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+IF(USE_LIBPOSTPROC)
+  ADM_INSTALL_LIB_FILES("${FFMPEG_BINARY_DIR}/libpostproc/${LIBAVCODEC_ADM}postproc-${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ENDIF()
 
 IF(USE_DXVA2)
   INSTALL(FILES "${FFMPEG_SOURCE_DIR}/libavcodec/dxva2.h" DESTINATION "${AVIDEMUX_INSTALL_INCLUDE_DIR}/avidemux/${AVIDEMUX_MAJOR_MINOR}/libavcodec" COMPONENT dev)

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/cmake/admFFmpegUtil.cmake -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/cmake/admFFmpegUtil.cmake Changed

@@ -8,14 +8,18 @@
   getFfmpegVersionFromHeader("libavcodec" "${sourceDir}/libavcodec/version_major.h" LIBAVCODEC_VERSION_MAJOR LIBAVCODEC_VERSION)
   getFfmpegVersionFromHeader("libavformat" "${sourceDir}/libavformat/version_major.h" LIBAVFORMAT_VERSION_MAJOR LIBAVFORMAT_VERSION)
   getFfmpegVersionFromHeader("libavutil" "${sourceDir}/libavutil/version.h" LIBAVUTIL_VERSION_MAJOR LIBAVUTIL_VERSION)
-  getFfmpegVersionFromHeader("libpostproc" "${sourceDir}/libpostproc/version_major.h" LIBPOSTPROC_VERSION_MAJOR LIBPOSTPROC_VERSION)
+  IF(USE_LIBPOSTPROC)
+    getFfmpegVersionFromHeader("libpostproc" "${sourceDir}/libpostproc/version_major.h" LIBPOSTPROC_VERSION_MAJOR LIBPOSTPROC_VERSION)
+  ENDIF()
   getFfmpegVersionFromHeader("libswscale" "${sourceDir}/libswscale/version_major.h" LIBSWSCALE_VERSION_MAJOR LIBSWSCALE_VERSION)
   SET(VERBOSE 1)
   IF(VERBOSE)
     MESSAGE(STATUS "AVFORMAT : ${LIBAVFORMAT_VERSION}, Major : ${LIBAVFORMAT_VERSION_MAJOR}")
     MESSAGE(STATUS "AVCODEC  : ${LIBAVCODEC_VERSION}, Major : ${LIBAVCODEC_VERSION_MAJOR}")
     MESSAGE(STATUS "AVUTIL   : ${LIBAVUTIL_VERSION}, Major : ${LIBAVUTIL_VERSION_MAJOR}")
-    MESSAGE(STATUS "POSTPRC  : ${LIBPOSTPROC_VERSION}, Major : ${LIBPOSTPROC_VERSION_MAJOR}")
+    IF(USE_LIBPOSTPROC)
+      MESSAGE(STATUS "POSTPROC : ${LIBPOSTPROC_VERSION}, Major : ${LIBPOSTPROC_VERSION_MAJOR}")
+    ENDIF()
     MESSAGE(STATUS "SWSCALE  : ${LIBSWSCALE_VERSION}, Major : ${LIBSWSCALE_VERSION_MAJOR}")
     MESSAGE("")
   ENDIF()
@@ -28,26 +32,34 @@
     SET(LIBAVCODEC_LIB lib${LIBAVCODEC_ADM}avcodec.${LIBAVCODEC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBAVFORMAT_LIB lib${LIBAVCODEC_ADM}avformat.${LIBAVFORMAT_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBAVUTIL_LIB lib${LIBAVCODEC_ADM}avutil.${LIBAVUTIL_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
-    SET(LIBPOSTPROC_LIB lib${LIBAVCODEC_ADM}postproc.${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBSWSCALE_LIB lib${LIBAVCODEC_ADM}swscale.${LIBSWSCALE_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+    IF(USE_LIBPOSTPROC)
+      SET(LIBPOSTPROC_LIB lib${LIBAVCODEC_ADM}postproc.${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+    ENDIF()
   elseIF(UNIX)
     SET(LIBAVCODEC_LIB lib${LIBAVCODEC_ADM}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBAVCODEC_VERSION})
     SET(LIBAVFORMAT_LIB lib${LIBAVCODEC_ADM}avformat${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBAVFORMAT_VERSION})
     SET(LIBAVUTIL_LIB lib${LIBAVCODEC_ADM}avutil${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBAVUTIL_VERSION})
-    SET(LIBPOSTPROC_LIB lib${LIBAVCODEC_ADM}postproc${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBPOSTPROC_VERSION})
     SET(LIBSWSCALE_LIB lib${LIBAVCODEC_ADM}swscale${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBSWSCALE_VERSION})
+    IF(USE_LIBPOSTPROC)
+      SET(LIBPOSTPROC_LIB lib${LIBAVCODEC_ADM}postproc${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBPOSTPROC_VERSION})
+    ENDIF()
   elseIF(MINGW)
     SET(LIBAVCODEC_LIB ${LIBAVCODEC_ADM}avcodec-${LIBAVCODEC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBAVFORMAT_LIB ${LIBAVCODEC_ADM}avformat-${LIBAVFORMAT_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBAVUTIL_LIB ${LIBAVCODEC_ADM}avutil-${LIBAVUTIL_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
-    SET(LIBPOSTPROC_LIB ${LIBAVCODEC_ADM}postproc-${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     SET(LIBSWSCALE_LIB ${LIBAVCODEC_ADM}swscale-${LIBSWSCALE_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+    IF(USE_LIBPOSTPROC)
+      SET(LIBPOSTPROC_LIB ${LIBAVCODEC_ADM}postproc-${LIBPOSTPROC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+    ENDIF()
   elseIF(MSVC)
     SET(LIBAVCODEC_LIB   avcodec.lib)
     SET(LIBAVFORMAT_LIB  avformat.lib)
     SET(LIBAVUTIL_LIB    avutil.lib)
-    SET(LIBPOSTPROC_LIB  postproc.lib)
     SET(LIBSWSCALE_LIB   swscale.lib)
+    IF(USE_LIBPOSTPROC)
+      SET(LIBPOSTPROC_LIB  postproc.lib)
+    ENDIF()
   ENDIF()
 ENDMACRO()
 
@@ -55,17 +67,22 @@
   getFfmpegLibNames("${sourceDir}")
 
   ADD_LIBRARY(ADM_libswscale UNKNOWN IMPORTED)
-  ADD_LIBRARY(ADM_libpostproc UNKNOWN IMPORTED)
   ADD_LIBRARY(ADM_libavutil UNKNOWN IMPORTED)
   ADD_LIBRARY(ADM_libavcodec UNKNOWN IMPORTED)
   ADD_LIBRARY(ADM_libavformat UNKNOWN IMPORTED)
+  IF(USE_LIBPOSTPROC)
+    ADD_LIBRARY(ADM_libpostproc UNKNOWN IMPORTED)
+  ENDIF()
+
 
   IF(${installed})
     SET_PROPERTY(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${binaryDir}/${LIBSWSCALE_LIB}")
-    SET_PROPERTY(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${binaryDir}/${LIBPOSTPROC_LIB}")
     SET_PROPERTY(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${binaryDir}/${LIBAVUTIL_LIB}")
     SET_PROPERTY(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${binaryDir}/${LIBAVCODEC_LIB}")
     SET_PROPERTY(TARGET ADM_libavformat PROPERTY IMPORTED_LOCATION "${binaryDir}/${LIBAVFORMAT_LIB}")
+    IF(USE_LIBPOSTPROC)
+      SET_PROPERTY(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${binaryDir}/${LIBPOSTPROC_LIB}")
+    ENDIF()
   ELSE()
     MACRO(IMPORTFF lib adm_lib location)
       SET_PROPERTY(TARGET ${adm_lib} PROPERTY IMPORTED_LOCATION "${location}")
@@ -74,10 +91,12 @@
     ENDMACRO()
 
     IMPORTFF(libswscale  ADM_libswscale "${binaryDir}/libswscale/${LIBSWSCALE_LIB}")
-    IMPORTFF(libpostproc ADM_libpostproc "${binaryDir}/libpostproc/${LIBPOSTPROC_LIB}")
     IMPORTFF(libavutil   ADM_libavutil "${binaryDir}/libavutil/${LIBAVUTIL_LIB}")
     IMPORTFF(libavcodec  ADM_libavcodec "${binaryDir}/libavcodec/${LIBAVCODEC_LIB}")
     IMPORTFF(libavformat ADM_libavformat "${binaryDir}/libavformat/${LIBAVFORMAT_LIB}")
+    IF(USE_LIBPOSTPROC)
+      IMPORTFF(libpostproc ADM_libpostproc "${binaryDir}/libpostproc/${LIBPOSTPROC_LIB}")
+    ENDIF()
 
     ADD_CUSTOM_TARGET(ffmpeg DEPENDS "${binaryDir}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}")
   ENDIF()

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/cmake/admFFmpegVersion.cmake -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/cmake/admFFmpegVersion.cmake Changed

avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/ffmpeg-9.0.1.tar.bz2 Added

avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/attic/libavcodec_ratecontrol.patch Changed

avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/attic/libpostproc_libpostproc.v.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavcodec_encode_h_msvc.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavcodec_encode_h_msvc.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavcodec_h264_parser.c.patch Changed

@@ -1,6 +1,6 @@
---- libavcodec/h264_parser.c.orig	2023-11-11 01:25:17.000000000 +0100
-+++ libavcodec/h264_parser.c	2024-05-30 01:09:42.571921235 +0200
-@@ -67,6 +67,103 @@
+--- libavcodec/h264_parser.c.orig	2026-08-04 00:14:47.000000000 +0200
++++ libavcodec/h264_parser.c	2026-09-12 23:03:30.643775967 +0200
+@@ -69,6 +69,103 @@
      int last_frame_num, last_picture_structure;
  } H264ParseContext;
  
@@ -15,7 +15,7 @@
 +static const SPS *findValidSPS(H264ParamSets *ps)
 +{
 +    int i;
-+    if(!ps)
++    if (!ps)
 +    {
 +        av_log(NULL, AV_LOG_ERROR, "findValidSPS called with invalid data\n");
 +        return NULL;
@@ -40,55 +40,55 @@
 +    H264ParseContext *ctx = parser->priv_data;
 +    int f;
 +    const SPS *sps;
-+    memset(info,0,sizeof(*info));
-+    sps=findValidSPS(&(ctx->ps));
-+    if(!sps)
++    memset(info, 0, sizeof(*info));
++    sps = findValidSPS(&(ctx->ps));
++    if (!sps)
 +    {
 +        return 0;
 +    }
-+    info->width=sps->mb_width  * 16;
-+    info->height=sps->mb_height * 16;
-+    if(sps->timing_info_present_flag)
++    info->width = sps->mb_width * 16;
++    info->height = sps->mb_height * 16;
++    if (sps->timing_info_present_flag)
 +    {
-+        float scale=sps->time_scale ;
-+        float ticks=sps->num_units_in_tick;
-+        float fps = scale/ticks;
-+        if(ticksPerFrame>1)
++        float scale = sps->time_scale;
++        float ticks = sps->num_units_in_tick;
++        float fps = scale / ticks;
++        if (ticksPerFrame > 1)
 +            fps /= ticksPerFrame;
 +        info->fps1000 = (uint32_t)(fps * 1000.);
 +#undef printf
-+        printf("Scale : %d, tick=%d, fps=%d\n",(int)scale,(int)ticks,(int)info->fps1000);
-+    }else
++        printf("Scale : %d, tick = %d, fps = %d\n", (int)scale, (int)ticks, (int)info->fps1000);
++    } else
 +    {
 +        printf("H264 No timing information\n");
 +    }
 +    // D.2.2 SEI Timing present if CpbDbpDelayPresentFlag=1 or pictStructPresent=1
 +    // CpbDbpDelayPresentFlag =1 if nal_hdr or vcl_hrd or ???
-+    f=sps->nal_hrd_parameters_present_flag | sps->vcl_hrd_parameters_present_flag;
-+    info->hasStructInfo=f | sps->pic_struct_present_flag;
++    f = sps->nal_hrd_parameters_present_flag | sps->vcl_hrd_parameters_present_flag;
++    info->hasStructInfo = f | sps->pic_struct_present_flag;
 +    // Check whether POC is explicitely set in slice header
-+    info->hasPocInfo=!sps->poc_type;
++    info->hasPocInfo = !sps->poc_type;
 +    // While decoding SEI, if CpbDpbDelaysPresentFlags is there we skip cpb_removal_delay + dpb_output_delay
 +
-+    info->CpbDpbToSkip=0;
-+    if(f)
++    info->CpbDpbToSkip = 0;
++    if (f)
 +    {
-+        info->CpbDpbToSkip=sps->cpb_removal_delay_length+sps->dpb_output_delay_length;
++        info->CpbDpbToSkip = sps->cpb_removal_delay_length + sps->dpb_output_delay_length;
 +    }
-+    info->log2MaxFrameNum=sps->log2_max_frame_num;
-+    info->log2MaxPocLsb=sps->log2_max_poc_lsb;
++    info->log2MaxFrameNum = sps->log2_max_frame_num;
++    info->log2MaxPocLsb = sps->log2_max_poc_lsb;
 +    // Needed to determine the offset of poc_lsb
-+    info->frameMbsOnlyFlag=sps->frame_mbs_only_flag;
++    info->frameMbsOnlyFlag = sps->frame_mbs_only_flag;
 +    //#warning fixme sar vs dar
-+    if(sps->vui_parameters_present_flag)
++    if (sps->vui_parameters_present_flag)
 +    {
 +        info->darNum = sps->vui.sar.num;
 +        info->darDen = sps->vui.sar.den;
-+    }else
++    } else
 +    {
 +        info->darNum = info->darDen = 1;
 +    }
-+    if(sps->crop_left || sps->crop_right || sps->crop_top || sps->crop_bottom)
++    if (sps->crop_left || sps->crop_right || sps->crop_top || sps->crop_bottom)
 +    {
 +        printf("Taking crop into account, left: %u, right: %u, top: %u, bottom: %u\n",
 +            sps->crop_left, sps->crop_right, sps->crop_top, sps->crop_bottom);
@@ -96,7 +96,7 @@
 +        info->width  -= sps->crop_left + sps->crop_right;
 +        info->height -= sps->crop_top  + sps->crop_bottom;
 +    }
-+    info->refFrames=sps->ref_frame_count;
++    info->refFrames = sps->ref_frame_count;
 +    return 1;
 +}
 +// /MEANX

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch Changed

@@ -1,8 +1,8 @@
---- libavcodec/hevc_parser.c.orig	2023-11-11 01:25:17.000000000 +0100
-+++ libavcodec/hevc_parser.c	2024-05-30 20:25:46.552614124 +0200
-@@ -30,6 +30,13 @@
- #include "h2645_parse.h"
- #include "parser.h"
+--- libavcodec/hevc/parser.c.orig	2026-08-04 00:14:47.000000000 +0200
++++ libavcodec/hevc/parser.c	2026-09-14 21:01:00.923634584 +0200
+@@ -33,6 +33,12 @@
+ #include "ps.h"
+ #include "sei.h"
  
 +/* MEANX */
 +const HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s);
@@ -10,11 +10,10 @@
 +const HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s);
 +/* /MEANX */
 +
-+
  #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
  
  #define IS_IRAP_NAL(nal) (nal->type >= 16 && nal->type <= 23)
-@@ -173,6 +180,136 @@
+@@ -171,6 +177,124 @@
  }
  
  /**
@@ -37,11 +36,7 @@
 +    if (!ps)
 +        return NULL;
 +
-+    // Do we have an active SPS?
-+    if (ps->sps)
-+        return ps->sps;
-+
-+    // Nope, probably no slice header decoded yet. Pick the first PPS from the list and keep fingers crossed.
++    // Pick the first PPS from the list and keep fingers crossed that it is the active one.
 +    for (i = 0; i < HEVC_MAX_PPS_COUNT; i++)
 +    {
 +        pps = ps->pps_listi;
@@ -80,11 +75,7 @@
 +    if (!ps)
 +        return NULL;
 +
-+    // Do we have an active PPS?
-+    if (ps->pps)
-+        return ps->pps;
-+
-+    // Nope, pick the first one from the list.
++    // Pick the first one from the list and hope for the best.
 +    for (i = 0; i < HEVC_MAX_PPS_COUNT; i++)
 +    {
 +        pps = ps->pps_listi;
@@ -114,11 +105,7 @@
 +    if (!ps)
 +        return NULL;
 +
-+    // Do we have a VPS set as active?
-+    if (ps->vps)
-+        return ps->vps;
-+
-+    // Nope, take the first PPS from the list and follow the chain.
++    // Take the first PPS from the list and follow the chain.
 +    for (i = 0; i < HEVC_MAX_PPS_COUNT; i++)
 +    {
 +        pps = ps->pps_listi;

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_file.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_file.c.patch Changed

@@ -1,10 +1,10 @@
---- libavformat/file.c.orig	2024-04-05 01:23:00.000000000 +0200
-+++ libavformat/file.c	2024-05-31 20:43:39.413526275 +0200
-@@ -164,11 +164,13 @@
+--- libavformat/file.c.orig	2026-08-04 00:14:48.000000000 +0200
++++ libavformat/file.c	2026-09-12 23:16:52.858769750 +0200
+@@ -169,11 +169,13 @@
      return c->fd;
  }
  
-+#define REMOVE_PROTO(x) if(av_strstart(x, "file:", &x)) av_strstart(x, "//", &x); // eum.
++#define REMOVE_PROTO(x) if (av_strstart(x, "file:", &x)) av_strstart(x, "//", &x); // eum.
 +
  static int file_check(URLContext *h, int mask)
  {
@@ -15,7 +15,7 @@
  
      {
  #if HAVE_ACCESS && defined(R_OK)
-@@ -252,7 +254,7 @@
+@@ -257,7 +259,7 @@
  #if HAVE_UNISTD_H
      int ret;
      const char *filename = h->filename;
@@ -24,7 +24,7 @@
  
      ret = rmdir(filename);
      if (ret < 0 && (errno == ENOTDIR
-@@ -274,8 +276,8 @@
+@@ -279,8 +281,8 @@
  {
      const char *filename_src = h_src->filename;
      const char *filename_dst = h_dst->filename;
@@ -35,12 +35,12 @@
  
      if (rename(filename_src, filename_dst) < 0)
          return AVERROR(errno);
-@@ -290,7 +292,7 @@
+@@ -295,7 +297,7 @@
      int fd;
      struct stat st;
  
 -    av_strstart(filename, "file:", &filename);
 +    REMOVE_PROTO(filename)
  
-     c->initial_pos = -1;
      if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) {
+         access = O_CREAT | O_RDWR;

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc.c.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_matroskaenc_vp9.c.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavformat_mpegtsenc.c.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_avassert_h.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_avassert_h.patch Changed

@@ -1,11 +1,11 @@
---- libavutil/avassert.h.orig	2023-11-11 01:25:17.000000000 +0100
-+++ libavutil/avassert.h	2024-05-31 20:57:25.815315915 +0200
-@@ -34,13 +34,17 @@
- #include "log.h"
+--- libavutil/avassert.h.orig	2026-08-04 00:14:48.000000000 +0200
++++ libavutil/avassert.h	2026-09-12 23:48:02.260661908 +0200
+@@ -36,13 +36,17 @@
  #include "macros.h"
+ #include "version.h"
  
-+extern void av_fatalHandler(const char *why,const char *file, int lineno);
-+typedef void (AV_FATAL_HANDLER)(const char *why,int lineno, const char *file);
++extern void av_fatalHandler(const char *why, const char *file, int lineno);
++typedef void (AV_FATAL_HANDLER)(const char *why, int lineno, const char *file);
 +
 +extern void av_setFatalHandler(AV_FATAL_HANDLER *func);
 +
@@ -16,7 +16,7 @@
      if (!(cond)) {                                                      \
 -        av_log(NULL, AV_LOG_PANIC, "Assertion %s failed at %s:%d\n",    \
 -               AV_STRINGIFY(cond), __FILE__, __LINE__);                 \
-+        av_fatalHandler( AV_STRINGIFY(cond),__FILE__,__LINE__);         \
++        av_fatalHandler(AV_STRINGIFY(cond), __FILE__, __LINE__);        \
          abort();                                                        \
      }                                                                   \
  } while (0)

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_avutil.h.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_hwcontext_vaapi.c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_hwcontext_vaapi.c.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_core/ffmpeg_package/patches/libavutil_log_c.patch Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

@@ -132,6 +132,17 @@
 }
 
 /**
+    \fn audioCodecIdToString
+    \brief Smuggle AAC LATM into codec names known to the core
+*/
+static const char *audioCodecIdToString(uint32_t codec)
+{
+    if (codec == MKV_MUX_LATM)
+        return "AAC LATM";
+    return getStrFromAudioCodec(codec);
+}
+
+/**
     \fn entryDesc::dump
     \brief Dump the track entry
 */
@@ -340,7 +351,7 @@
                     ptr += wavSize + 6; // offset of GUID
                     typedef struct { uint32_t data1; uint16_t data2; uint16_t data3; uint8_t data48; } msGuid;
                     typedef struct { uint16_t tag; msGuid guid; } tag2guid;
-#define NB_GUIDS 7
+#define NB_GUIDS 8
                     const tag2guid supportedGuidsNB_GUIDS = {
                         { WAV_PCM,      { 0x1,0x0,0x10, { 0x80,0x0,0x0,0xaa,0x0,0x38,0x9b,0x71 } } /* KSDATAFORMAT_SUBTYPE_PCM */ },
                         { WAV_MSADPCM,  { 0x2,0x0,0x10, { 0x80,0x0,0x0,0xaa,0x0,0x38,0x9b,0x71 } } /* KSDATAFORMAT_SUBTYPE_ADPCM */ },
@@ -348,7 +359,8 @@
                         { WAV_ULAW,     { 0x7,0x0,0x10, { 0x80,0x0,0x0,0xaa,0x0,0x38,0x9b,0x71 } } /* KSDATAFORMAT_SUBTYPE_MULAW */ },
                         { WAV_LPCM,     { 0xe06d8032,0xdb46,0x11cf, { 0xb4,0xd1,0x0,0x80,0x5f,0x6c,0xbb,0xea } } /* KSDATAFORMAT_SUBTYPE_LPCM_AUDIO */ },
                         { WAV_AC3,      { 0xe06d802c,0xdb46,0x11cf, { 0xb4,0xd1,0x0,0x80,0x5f,0x6c,0xbb,0xea } } /* KSDATAFORMAT_SUBTYPE_AC3_AUDIO */ },
-                        { WAV_MP2,      { 0xe06d802b,0xdb46,0x11cf, { 0xb4,0xd1,0x0,0x80,0x5f,0x6c,0xbb,0xea } } /* ,KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO */ }
+                        { WAV_MP2,      { 0xe06d802b,0xdb46,0x11cf, { 0xb4,0xd1,0x0,0x80,0x5f,0x6c,0xbb,0xea } } /* ,KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO */ },
+                        { MKV_MUX_LATM, { 0x1602,0x0,0x10, { 0x80,0x0,0x0,0xaa,0x0,0x38,0x9b,0x71 } } /* MEDIASUBTYPE_MPEG_LOAS */ }
                     };
                     for(int i=0; i < NB_GUIDS; i++)
                     {
@@ -357,7 +369,7 @@
                         if(v1->data1 == v2->data1 && v1->data2 == v2->data2 && !memcmp(v1->data4,v2->data4,8))
                         {
                             t->wavHeader.encoding = supportedGuidsi.tag;
-                            ADM_info("Encoding set from SubFormat GUID to 0x%x (%s)\n",t->wavHeader.encoding,getStrFromAudioCodec(t->wavHeader.encoding));
+                            ADM_info("Encoding set from SubFormat GUID to 0x%x (%s)\n", t->wavHeader.encoding, audioCodecIdToString(t->wavHeader.encoding));
                             break;
                         }
                     }

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.cpp Changed

@@ -56,7 +56,7 @@
     ADM_info("Our display: %#x\n",admLibVA::getDisplay());
     switch(VaEncSettings.profile)
     {
-#define SAY(x) case FF_PROFILE_H264_##x: _context->profile=FF_PROFILE_H264_##x; break;
+#define SAY(x) case AV_PROFILE_H264_##x: _context->profile=AV_PROFILE_H264_##x; break;
         SAY(CONSTRAINED_BASELINE)
         SAY(MAIN)
         SAY(HIGH)
@@ -331,9 +331,9 @@
     ffvaenc_encoder *conf=&VaEncSettings;
 
     diaMenuEntry h264Profile={
-        {FF_PROFILE_H264_CONSTRAINED_BASELINE,QT_TRANSLATE_NOOP("ffVAEncH264","Baseline"),NULL},
-        {FF_PROFILE_H264_MAIN,QT_TRANSLATE_NOOP("ffVAEncH264","Main"),NULL},
-        {FF_PROFILE_H264_HIGH,QT_TRANSLATE_NOOP("ffVAEncH264","High"),NULL}
+        {AV_PROFILE_H264_CONSTRAINED_BASELINE,QT_TRANSLATE_NOOP("ffVAEncH264","Baseline"),NULL},
+        {AV_PROFILE_H264_MAIN,QT_TRANSLATE_NOOP("ffVAEncH264","Main"),NULL},
+        {AV_PROFILE_H264_HIGH,QT_TRANSLATE_NOOP("ffVAEncH264","High"),NULL}
     };
     diaMenuEntry rateControlMode={
         {ADM_FFVAENC_RC_CRF,QT_TRANSLATE_NOOP("ffVAEncH264","Constant Rate Factor"),NULL},
@@ -353,7 +353,7 @@
 #endif
     diaElemUInteger gopSize(PX(gopsize),QT_TRANSLATE_NOOP("ffVAEncH264","GOP Size:"),1,250);
 
-    if(conf->profile==FF_PROFILE_H264_CONSTRAINED_BASELINE)
+    if (conf->profile == AV_PROFILE_H264_CONSTRAINED_BASELINE)
         conf->bframes=0;
 
     diaElemUInteger maxBframes(PX(bframes),QT_TRANSLATE_NOOP("ffVAEncH264","Maximum Consecutive B-Frames:"),0,4);

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_videoEncoder/ffVaH264/ADM_ffVAEncH264.h Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_videoEncoder/huff/ADM_huffEncoder.cpp Changed

avidemux2-2.8.2.git20260910.tar.xz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -> avidemux2-2.8.2.git20260915.tar.xz/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt Changed

Overview

Request 6588 (accepted)

Request History