Index: branches/2016Q1/multimedia/avidemux/Makefile.common
===================================================================
--- branches/2016Q1/multimedia/avidemux/Makefile.common	(revision 408869)
+++ branches/2016Q1/multimedia/avidemux/Makefile.common	(revision 408870)
@@ -1,280 +1,289 @@
 # $FreeBSD$
 
+PORTREVISION?=	1
 AVIDEMUX_VERSION=	2.6.11
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
 
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm \
 		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
 		libdca.so:${PORTSDIR}/multimedia/libdca \
 		libpng.so:${PORTSDIR}/graphics/png
 
 LICENSE=	GPLv2
 
 USE_GNOME=	libxml2
 USE_QT4=	# empty
 
 OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
 
 USE_SQLITE=	yes
 USES=		cmake:outsource pkgconfig iconv gmake compiler:features
 USES+=		dos2unix execinfo
 DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake
 CMAKE_ARGS+=	-DGNUMAKE_EXECUTABLE=gmake
 CMAKE_ARGS+=	-DAVIDEMUX_PACKAGER=none
 CMAKE_ARGS+=	-DQT5:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
 OPTIONS_DEFINE=	QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \
-		PULSEAUDIO XVIDEO FAAC \
+		PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \
 		FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU
 OPTIONS_DEFAULT=	QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
 			SDL FAAD VORBIS
+OPTIONS_SUB=	yes
 CLI_DESC=	Build CLI tool
+
+FRIBIDI_CMAKE_OFF=	-DFRIDIBI:BOOL=OFF
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+OPUS_CMAKE_OFF=		-DOPUS:BOOL=OFF
+OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+TWOLAME_CMAKE_OFF=	-DTWOLAME:BOOL=OFF
+TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
 
 .if !defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	LAME FAAC AMR X264
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 . 	if ${PORT_OPTIONS:MQT4}
 PLIST_SUB+=	QT_NLS=""
 .	else
 PLIST_SUB+=	QT_NLS="@comment "
 .	endif
 .else
 CMAKE_ARGS+=	-DNO_NLS:BOOL=ON
 PLIST_SUB+=	NLS="@comment " QT_NLS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 # is this kosher?  the result seems to run tho...  (see ports/185997)
 .if $(COMPILER_FEATURES:Mlibc++)
 LDFLAGS+=	-lc++
 .endif
 
 #.if ${COMPILER_TYPE} == clang
 USE_GCC=	yes
 #.endif
 
 # for libexecinfo: (so that __builtin_frame_address() finds the top
 # of the stack)
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fno-omit-frame-pointer
 #MAKE_ENV+=	ARCH=x86_64
 #CONFIGURE_ENV+=	ARCH=x86_64
 .endif
 .if !exists(/usr/lib/libexecinfo.so)
 CMAKE_ARGS+=	-DLIBEXECINFO_INCLUDE_DIR=${LOCALBASE}/include
 CMAKE_ARGS+=	-DLIBEXECINFO_LIBRARY_DIR=${LOCALBASE}/lib/libexecinfo.so
 .else
 CMAKE_ARGS+=	-DLIBEXECINFO_INCLUDE_DIR=/usr/include
 CMAKE_ARGS+=	-DLIBEXECINFO_LIBRARY_DIR=-lexecinfo
 .endif
 
 # We haven't ALSA(Never) & Aften(Yet) on FreeBSD
 CMAKE_ARGS+=	-DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF
 
 .if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MQT4)
 CMAKE_ARGS+=	-DX11:BOOL=OFF
 .else
 USE_GNOME+=	libxslt
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
 USE_GNOME+=	gnomeprefix gtk30
 PLIST_SUB+=	GTK=""
 .else
 CMAKE_ARGS+=	-DGTK:BOOL=OFF
 PLIST_SUB+=	GTK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
 CMAKE_ARGS+=	-DLRELEASE_EXECUTABLE=${LOCALBASE}/bin/lrelease-qt4
 USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build gui
 PLIST_SUB+=	QT4=""
 .else
 CMAKE_ARGS+=	-DQT4:BOOL=OFF
 PLIST_SUB+=	QT4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PLIST_SUB+=	CLI=""
 .else
 PLIST_SUB+=	CLI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOSS}
 CMAKE_ARGS+=	-DOSS_SUPPORT:BOOL=ON
 .else
 CMAKE_ARGS+=	-DOSS_SUPPORT:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 PLIST_SUB+=	ESD=""
 .else
 CMAKE_ARGS+=	-DESD:BOOL=OFF
 PLIST_SUB+=	ESD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
 .else
 CMAKE_ARGS+=	-DJACK:BOOL=OFF
 PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CMAKE_ARGS+=	-DPULSEAUDIOSIMPLE:BOOL=OFF
 PLIST_SUB+=	PULSE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 PLIST_SUB+=	FREETYPE=""
 .else
 CMAKE_ARGS+=	-DFREETYPE2:BOOL=OFF
 PLIST_SUB+=	FREETYPE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFONTCONFIG}
 LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 .else
 CMAKE_ARGS+=	-DFONTCONFIG:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MXVIDEO}
 #LIB_DEPENDS+=	Xv:${PORTSDIR}/x11/libXv
 USE_XORG+=	xv
 .else
 CMAKE_ARGS+=	-DXVIDEO:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
 LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
 PLIST_SUB+=	FAAC=""
 .else
 CMAKE_ARGS+=	-DFAAC:BOOL=OFF
 PLIST_SUB+=	FAAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
 LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 PLIST_SUB+=	LAME=""
 .else
 CMAKE_ARGS+=	-DLAME:BOOL=OFF
 PLIST_SUB+=	LAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
 LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 PLIST_SUB+=	FAAD=""
 .else
 CMAKE_ARGS+=	-DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF
 PLIST_SUB+=	FAAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MX264}
 LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/libx264
 PLIST_SUB+=	X264=""
 .else
 CMAKE_ARGS+=	-DX264:BOOL=OFF
 PLIST_SUB+=	X264="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MX265}
 LIB_DEPENDS+=	libx265.so:${PORTSDIR}/multimedia/x265
 PLIST_SUB+=	X265=""
 .else
 CMAKE_ARGS+=	-DX265:BOOL=OFF
 PLIST_SUB+=	X265="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 PLIST_SUB+=	VPX=""
 .else
 CMAKE_ARGS+=	-DVPXDEC:BOOL=OFF
 PLIST_SUB+=	VPX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXVID}
 LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 PLIST_SUB+=	XVID=""
 .else
 CMAKE_ARGS+=	-DXVID:BOOL=OFF
 PLIST_SUB+=	XVID="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 PLIST_SUB+=	SDL=""
 .else
 CMAKE_ARGS+=	-DSDL:BOOL=OFF
 PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVAAPI}
 LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
 PLIST_SUB+=	VAAPI=""
 .else
 CMAKE_ARGS+=	-DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF
 PLIST_SUB+=	VAAPI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVDPAU}
 LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 PLIST_SUB+=	VDPAU=""
 .else
 CMAKE_ARGS+=	-DVDPAU:BOOL=OFF
 PLIST_SUB+=	VDPAU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 CMAKE_ARGS+=	-DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAMR}
 LIB_DEPENDS+=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
 PLIST_SUB+=	AMRNB=""
 PLIST_SUB+=	AMRWB=""
 .else
 CMAKE_ARGS+=	-DOPENCORE_AMRNB:BOOL=OFF
 PLIST_SUB+=	AMRNB="@comment "
 CMAKE_ARGS+=	-DOPENCORE_AMRWB:BOOL=OFF
 PLIST_SUB+=	AMRWB="@comment "
 .endif
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
 post-patch:
 	@${MKDIR} ${CONFIGURE_WRKSRC}/config
 	@${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config
 	@${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt
 
 post-configure-common:
 	@${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||g'
Index: branches/2016Q1/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake
===================================================================
--- branches/2016Q1/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake	(nonexistent)
+++ branches/2016Q1/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake	(revision 408870)
@@ -0,0 +1,12 @@
+--- cmake/admCheckX265.cmake.orig	2016-01-29 08:47:25 UTC
++++ cmake/admCheckX265.cmake
+@@ -19,9 +19,6 @@ MACRO(checkX265)
+ 					MESSAGE("WARNING: x265 core version is too old.  At least version 9 is required.")
+ 					SET(X265_FOUND 0)
+ 				ELSE (x265_version LESS 9)
+-                                        IF(NOT WIN32)
+-                                                SET(DL dl)
+-                                        ENDIF(NOT WIN32)
+ 					FIND_HEADER_AND_LIB(X265 x265.h x265 x265_encoder_open_${x265_version} ${DL})
+ 				ENDIF (x265_version LESS 9)
+ 			ELSE (_X265_FOUND AND _X265_CONFIG_FOUND)

Property changes on: branches/2016Q1/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q1/multimedia/avidemux-plugins/pkg-plist
===================================================================
--- branches/2016Q1/multimedia/avidemux-plugins/pkg-plist	(revision 408869)
+++ branches/2016Q1/multimedia/avidemux-plugins/pkg-plist	(revision 408870)
@@ -1,460 +1,463 @@
 lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so
 lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so
 lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so
 lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so
+%%OPUS%%lib/ADM_plugins6/audioDecoder/libADM_ad_opus.so
 lib/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so
 lib/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
 lib/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
 %%VORBIS%%lib/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so
 lib/ADM_plugins6/audioDevices/libADM_av_oss.so
 %%LAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_lame.so
 lib/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so
 lib/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so
 lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
 lib/ADM_plugins6/audioEncoders/libADM_ae_pcm.so
+%%TWOLAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_twolame.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_png.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_null.so
 lib/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
 lib/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
 lib/ADM_plugins6/videoFilters/libADM_vf_black.so
 lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
 lib/ADM_plugins6/videoFilters/libADM_vf_decimate.so
 lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
 lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so
 lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so
 lib/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
 lib/ADM_plugins6/videoFilters/libADM_vf_gauss.so
 lib/ADM_plugins6/videoFilters/libADM_vf_median.so
 lib/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
 lib/ADM_plugins6/videoFilters/libADM_vf_separateField.so
+%%FRIBIDI%%%%FREETYPE%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.so
 lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
 lib/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
 lib/ADM_plugins6/videoFilters/libADM_hf_hflip.so
 lib/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
 lib/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
 lib/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
 lib/ADM_plugins6/videoFilters/libADM_vf_logo.so
 lib/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
 lib/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
 lib/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
 lib/ADM_plugins6/videoFilters/libADM_vf_msharpen.so
 lib/ADM_plugins6/videoFilters/libADM_vf_printInfo.so
 lib/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
 lib/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
 lib/ADM_plugins6/videoFilters/libADM_vf_rotate.so
 lib/ADM_plugins6/videoFilters/libADM_vf_stackField.so
 lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
 lib/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
 lib/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
 lib/ADM_plugins6/videoFilters/libADM_vf_telecide.so
 lib/ADM_plugins6/videoFilters/libADM_vf_yadif.so
 lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 lib/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
 lib/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
 lib/ADM_plugins6/demuxers/libADM_dm_flv.so
 lib/ADM_plugins6/demuxers/libADM_dm_pic.so
 lib/ADM_plugins6/demuxers/libADM_dm_mp4.so
 lib/ADM_plugins6/demuxers/libADM_dm_matroska.so
 lib/ADM_plugins6/demuxers/libADM_dm_opendml.so
 lib/ADM_plugins6/demuxers/libADM_dm_ps.so
 lib/ADM_plugins6/demuxers/libADM_dm_ts.so
 lib/ADM_plugins6/demuxers/libADM_dm_asf.so
 lib/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
 lib/ADM_plugins6/demuxers/libADM_dm_mxf.so
 lib/ADM_plugins6/muxers/libADM_mx_dummy.so
 lib/ADM_plugins6/muxers/libADM_mx_mp4v2.so
 lib/ADM_plugins6/muxers/libADM_mx_avi.so
 lib/ADM_plugins6/muxers/libADM_mx_raw.so
 lib/ADM_plugins6/muxers/libADM_mx_flv.so
 lib/ADM_plugins6/muxers/libADM_mx_mp4.so
 lib/ADM_plugins6/muxers/libADM_mx_Mkv.so
 lib/ADM_plugins6/muxers/libADM_mx_ffPS.so
 lib/ADM_plugins6/muxers/libADM_mx_ffTS.so
 lib/ADM_plugins6/autoScripts/720p.py
 lib/ADM_plugins6/autoScripts/PSP.py
 lib/ADM_plugins6/autoScripts/check24fps.py
 lib/ADM_plugins6/autoScripts/svcd.py
 lib/ADM_plugins6/autoScripts/vcd.py
 lib/ADM_plugins6/autoScripts/dvd.py
 lib/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
 lib/ADM_plugins6/autoScripts/lib/ADM_image.py
 %%VPX%%lib/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
 %%ESD%%lib/ADM_plugins6/audioDevices/libADM_av_esd.so
 %%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so
 %%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so
 %%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so
 %%PULSE%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
 %%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
 %%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
 %%AMRWB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so
 %%QT4%%lib/ADM_plugins6/scriptEngines/qt4/libadm_script_QT4.so
 %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %%QT4%%%%X264%%lib/ADM_plugins6/videoEncoders/qt4/libADM_ve_x264_QT4.so
 %%QT4%%%%X265%%lib/ADM_plugins6/videoEncoders/qt4/libADM_ve_x265_QT4.so
 %%CLI%%%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
 %%CLI%%%%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_HueQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_asharpQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_chromaShiftQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_contrastQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_cropQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_eq2QT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_mpdelogoQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_swscaleResizeQT4.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_glBenchmark.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_glResize.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_rotateGlFrag2.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlFrag2.so
 %%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlVertex.so
 %%QT4%%share/avidemux6/help/QtScriptQT4/Dialog.jpg
 %%QT4%%share/avidemux6/help/QtScriptQT4/_dialog_8admjs-example.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/_transcode_directory_8admjs-example.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/annotated.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/avidemux_icon_small.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/bc_s.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/bdwn.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_encoder-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_encoder.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output_collection-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output_collection.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_properties-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_properties.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item_collection-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item_collection.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_control_collection-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_control_collection.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_dialog-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_dialog.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_directory-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_directory.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_editor-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_editor.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_file-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_file.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_file_information-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_file_information.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_frame_properties-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_frame_properties.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_muxer-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_muxer.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_segment-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_segment.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_segment_collection-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_segment_collection.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_decoder-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_decoder.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_encoder-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_encoder.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_file_properties-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_file_properties.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter_collection-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter_collection.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_output-members.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/class_video_output.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/classes.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/closed.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/doxygen.css
 %%QT4%%share/avidemux6/help/QtScriptQT4/dynsections.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/examples.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2blank.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2cl.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2doc.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2folderclosed.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2folderopen.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2lastnode.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2link.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mlastnode.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mnode.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mo.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2node.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2ns.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2plastnode.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2pnode.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2splitbar.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/ftv2vertline.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x62.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x64.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x65.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x67.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x68.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x69.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6a.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6c.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6e.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6f.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x70.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x71.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x72.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x74.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x75.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x76.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x77.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_enum.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_eval.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_func.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/functions_prop.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/group__global_functions.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/hierarchy.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/jquery.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/modules.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/nav_f.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/nav_g.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/nav_h.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/open.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_62.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_62.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_63.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_64.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_64.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_65.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_65.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_66.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_67.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_67.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_68.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_68.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_69.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_69.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6a.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6a.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6c.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6c.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6d.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6e.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6e.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6f.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6f.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_70.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_70.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_71.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_71.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_72.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_72.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_73.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_74.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_74.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_75.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_75.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_76.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_76.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_77.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/all_77.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_63.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_64.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_64.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_65.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_65.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_66.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6c.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6c.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6d.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_73.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_76.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_76.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/close.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_63.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_66.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_67.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_67.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_69.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_69.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6d.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6f.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6f.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_70.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_70.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_73.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_62.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_62.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_63.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_64.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_64.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_65.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_65.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_66.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_68.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_68.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_69.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_69.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6a.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6a.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6c.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6c.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6d.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6e.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6e.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6f.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6f.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_70.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_70.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_72.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_72.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_73.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_74.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_74.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_75.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_75.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_77.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_77.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_63.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_64.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_64.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_65.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_65.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_66.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_69.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_69.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6c.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6c.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6d.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6f.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6f.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_70.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_70.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_72.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_72.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_73.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_74.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_74.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_75.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_75.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_77.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_77.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/groups_67.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/groups_67.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/mag_sel.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/nomatches.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/pages_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/pages_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_61.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_61.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_62.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_62.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_63.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_63.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_64.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_64.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_65.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_65.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_66.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_66.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_67.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_67.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_68.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_68.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_69.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_69.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6c.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6c.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6d.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6d.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6e.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6e.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6f.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6f.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_70.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_70.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_71.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_71.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_72.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_72.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_73.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_73.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_74.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_74.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_76.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_76.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_77.html
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_77.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/search.css
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/search.js
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/search_l.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/search_m.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/search/search_r.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/sync_off.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/sync_on.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/tab_a.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/tab_b.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/tab_h.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/tab_s.png
 %%QT4%%share/avidemux6/help/QtScriptQT4/tabs.css
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 408869)
+++ branches/2016Q1	(revision 408870)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r408848