We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Overview
avidemux3.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sat Jul 11 2015 - joerg.lorenzen@ki.tng.de4
+5
+- Update to version 2.6.106
+ * Re-added translations7
+ * Re-added avsproxy8
+ * Fixed multi passes with x264 when file has non ascii chars9
+ * Added experimental Qt5 build for mac10
+ * Fixed a bug with filler frames (fraps)11
+- update internal ffmpeg to version 2.7.112
+13
+- Version 2.6.914
+ * x265 support by KoolAidMan.15
+ * Qt4 and Qt5 support.16
+ * Compatibility with newer VAAPI.17
+ * Updated ffmpeg libraries.18
+ * Simple support for nvenc (linux).19
+ * Better compatibility with Dash file, Flv.20
+ * AvsProxy improvements (hinterwaeldler).21
+ * Misc fixes (asjchult).22
+ * Plenty of bugfixes and new bugs.23
+ * Win32 and Win64 builds are now using winbuilds.org, Xp no24
+ longer supported.25
+26
+-------------------------------------------------------------------27
Sat May 02 2015 - joerg.lorenzen@ki.tng.de28
+29
- fixed build for openSUSE = 11.430
31
-------------------------------------------------------------------32
Thu Feb 26 2015 - joerg.lorenzen@ki.tng.de33
+34
- update internal ffmpeg to version 1.2.1235
36
-------------------------------------------------------------------37
Tue Dec 23 2014 - joerg.lorenzen@ki.tng.de38
+39
- update internal ffmpeg to version 1.2.1140
- removed workaround for build on arm armv6l/armv6hl, the problem41
is caused by additional RaspberryPi repository and should be42
43
44
-------------------------------------------------------------------45
Sat Nov 08 2014 - joerg.lorenzen@ki.tng.de46
+47
- added patch and dependencies to enable build on ARM CPU48
- removed some unneeded dependencies49
50
-------------------------------------------------------------------51
Wed Nov 05 2014 - joerg.lorenzen@ki.tng.de52
+53
- update internal ffmpeg to version 1.2.1054
55
-------------------------------------------------------------------56
Fri Oct 17 2014 - joerg.lorenzen@ki.tng.de57
+58
- changed BuildRequires to pkgconfig where possible59
- enable build for SLES, unfortunately without frontends qt and gtk60
because SLES doesn't provide gtk3 and qt >= 4.761
62
-------------------------------------------------------------------63
Fri Oct 10 2014 - joerg.lorenzen@ki.tng.de64
+65
- update internal ffmpeg to version 1.2.966
67
-------------------------------------------------------------------68
Fri Aug 22 2014 - joerg.lorenzen@ki.tng.de69
+70
- update internal ffmpeg to version 1.2.871
72
-------------------------------------------------------------------73
Tue Jun 24 2014 - joerg.lorenzen@ki.tng.de74
+75
- update internal ffmpeg to version 1.2.776
77
-------------------------------------------------------------------78
Fri Mar 14 2014 - joerg.lorenzen@ki.tng.de79
+80
- Update to version 2.6.881
* Image/export: Proper initialization of Qz for jpeg export82
* UI : Add an override menu to force language83
84
85
-------------------------------------------------------------------86
Wed Mar 12 2014 - joerg.lorenzen@ki.tng.de87
+88
- update internal ffmpeg to version 1.2.689
90
-------------------------------------------------------------------91
Sat Feb 01 2014 - joerg.lorenzen@ki.tng.de92
+93
- update internal ffmpeg to version 1.2.594
95
-------------------------------------------------------------------96
Mon Dec 09 2013 - joerg.lorenzen@ki.tng.de97
+98
- Update to version 2.6.799
* [MKV] Fix seeking in h264100
* [TS/H264] Split on NALU boundaries, it was off by one byte101
102
103
-------------------------------------------------------------------104
Sat Nov 02 2013 - joerg.lorenzen@ki.tng.de105
+106
- changes in spec file to enable build for openSUSE 11.4 and 12.1107
108
-------------------------------------------------------------------109
Wed Oct 30 2013 - joerg.lorenzen@ki.tng.de110
+111
- Initial package, version 2.6.6112
avidemux3.spec
Changed
314
1
2
#3
# spec file for package avidemux34
#5
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.6
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.7
#8
# All modifications and additions to the file contributed by third parties9
# remain the property of their copyright owners, unless otherwise agreed10
11
#12
13
14
-%define ffmpeg_version 1.2.1215
+%define ffmpeg_version 2.7.116
17
Name: avidemux318
Summary: Graphical video editing and transcoding tool19
-Version: 2.6.820
+Version: 2.6.1021
Release: 122
-Url: http://www.avidemux.org23
+Url: http://avidemux.sourceforge.net/24
Source0: avidemux_%{version}.tar.gz25
Source1: avidemux3-qt4.desktop26
Source2: avidemux3-gtk.desktop27
Source3: ffmpeg-%{ffmpeg_version}.tar.bz228
Source4: config.mak.diff29
-Source5: xvba_support_from_xbmc_xvba.patch30
+Source5: libavcodec_put_bits.h.patch31
+Source6: xvba_support_from_xbmc_xvba.patch32
+Source7: libavcodec_x86_fmtconvert_init.c.patch33
+Source8: libavcodec_mpegvideo_enc.c.patch34
+Source9: libavcodec_mpeg12enc.c.patch35
Patch0: avidemux-cmake-2.8.8.patch36
Patch1: avidemux-linking.patch37
Patch2: avidemux-x264_plugins.patch38
-Patch3: avidemux-package_version.patch39
-Patch4: avidemux-bootStrap.patch40
-Patch5: avidemux-cpu_armel.patch41
+Patch3: avidemux-x265_plugins.patch42
+Patch4: avidemux-package_version.patch43
+Patch5: avidemux-bootStrap.patch44
+Patch6: avidemux-cpu_armel.patch45
+Patch7: avidemux-ADM_VERSION.patch46
License: GPL-2.047
Group: Productivity/Multimedia/Video/Editors and Convertors48
49
50
BuildRequires: pkgconfig(glu)51
BuildRequires: pkgconfig(vdpau)52
BuildRequires: pkgconfig(xv)53
-## newer version of libav are not compatible to avidemux54
-%if 0%{?suse_version} < 131055
+%if 0%{?suse_version} >= 131056
BuildRequires: pkgconfig(libva)57
%endif58
59
60
BuildRequires: pkgconfig(libass)61
%if 0%{?sles_version}62
BuildRequires: libx264-devel63
+BuildRequires: libx265-devel64
%else65
BuildRequires: pkgconfig(x264)66
+BuildRequires: pkgconfig(x265)67
%endif68
69
%if ! 0%{?sles_version}70
71
Group: Productivity/Multimedia/Video/Editors and Convertors72
Provides: avidemux3-frontend = %{version}-%{release}73
Requires: avidemux3 = %{version}-%{release}74
-Requires: avidemux3-qt4-lang = %{version}-%{release}75
Requires: avidemux3-help = %{version}-%{release}76
+Recommends: avidemux3-qt4-lang = %{version}-%{release}77
78
%description qt479
Avidemux is a free video editor designed for simple cutting, filtering and80
81
82
This package contains the Qt graphical interface for avidemux.83
84
-%lang_package -n avidemux3-qt485
+%package qt4-lang86
+Summary: Languages for package avidemux3-qt487
+Group: System/Localization88
+Requires: avidemux3-qt4 = %{version}-%{release}89
+BuildArch: noarch90
+91
+%description qt4-lang92
+Avidemux is a free video editor designed for simple cutting, filtering and93
+encoding tasks. It supports many file types, including AVI, DVD compatible94
+MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated95
+using projects, job queue and powerful scripting capabilities.96
+97
+Avidemux is available for Linux, BSD, Mac OS X and Microsoft Windows under98
+the GNU GPL license. The program was written from scratch by Mean, but code99
+from other people and projects has been used as well. Patches, translations100
+and even bug reports are always welcome.101
+102
+This package provides translations for package avidemux3-qt4.103
104
%package help105
Summary: Help files for avidemux106
107
echo 'from Config import *' >> %{_sourcedir}/avidemux3-rpmlintrc108
echo 'addFilter("libdir-macro-in-noarch-package")' >> %{_sourcedir}/avidemux3-rpmlintrc109
%endif110
-find . -type f -exec dos2unix -q {} \;111
-sed -i -e 's|set(FFMPEG_VERSION "1.2.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake112
-rm -f avidemux_core/ffmpeg_package/ffmpeg-1.2.1.tar.bz2113
+find ./ -name '*.bash' -exec dos2unix -q {} \;114
+find ./ -name '*.cmake' -exec dos2unix -q {} \;115
+find ./ -name '*.cpp' -exec dos2unix -q {} \;116
+find ./ -name '*.sh' -exec dos2unix -q {} \;117
+find ./ -name '*.sql' -exec dos2unix -q {} \;118
+find ./ -name '*.txt' -exec dos2unix -q {} \;119
+find . -type f -exec sed -i -e 's|intfloat_readwrite.h|intfloat.h|g' {} \;120
+sed -i -e 's|set(FFMPEG_VERSION "2.6.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake121
+rm -f avidemux_core/ffmpeg_package/ffmpeg-2.6.1.tar.bz2122
cp %{S:3} avidemux_core/ffmpeg_package/123
pushd avidemux_core/ffmpeg_package/patches124
rm -f config.mak.diff125
+rm -f libavcodec_put_bits.h.patch126
+rm -f libavcodec_x86_fmtconvert_init.c.patch127
+rm -f libavcodec_mpegvideo_enc.c.patch128
+rm -f libavcodec_mpeg12enc.c.patch129
cp %{S:4} .130
+cp %{S:5} .131
+cp %{S:7} .132
+cp %{S:8} .133
+cp %{S:9} .134
pushd xvba135
rm -f xvba_support_from_xbmc_xvba.patch136
-cp %{S:5} .137
+cp %{S:6} .138
popd139
popd140
%patch0 -p0141
142
%patch3 -p0143
%patch4 -p0144
%patch5 -p0145
+%patch6 -p0146
+%patch7 -p0147
+chmod 755 bootStrap.bash148
+chmod 644 AUTHORS COPYING README149
150
%build151
%if ! 0%{?sles_version}152
153
export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing"154
%endif155
156
-chmod 755 bootStrap.bash157
%if ! 0%{?sles_version}158
./bootStrap.bash --with-cli --with-gtk159
%else160
161
# delete devel file (only needed for build)162
rm -rf %{buildroot}%{_includedir}163
164
+## find . -name "config.mak" -exec install -D -m644 {} %{buildroot}%{_datadir}/avidemux3/help/config.mak \;165
+166
%fdupes %buildroot167
168
%post -p /sbin/ldconfig169
170
171
%files172
%defattr(-,root,root)173
-%{_libdir}/libADM6avcodec.so.54174
-%{_libdir}/libADM6avformat.so.54175
-%{_libdir}/libADM6avutil.so.52176
-%{_libdir}/libADM6postproc.so.52177
-%{_libdir}/libADM6swscale.so.2178
+%{_libdir}/libADM6avcodec.so.*179
+%{_libdir}/libADM6avformat.so.*180
+%{_libdir}/libADM6avutil.so.*181
+%{_libdir}/libADM6postproc.so.*182
+%{_libdir}/libADM6swscale.so.*183
%{_libdir}/libADM_audioParser6.so184
%{_libdir}/libADM_core6.so185
%{_libdir}/libADM_coreAudio6.so186
187
%{_libdir}/libADM_coreImage6.so188
%{_libdir}/libADM_coreImageLoader6.so189
%{_libdir}/libADM_coreJobs.so190
-%if 0%{?suse_version} < 1310191
+%if 0%{?suse_version} >= 1310192
%{_libdir}/libADM_coreLibVA6.so193
%endif194
%{_libdir}/libADM_coreMuxer6.so195
196
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json197
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json198
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json199
-%if ! 0%{?sles_version}200
-%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_qt.so201
-%endif202
%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so203
%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so204
%{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so205
206
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so207
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so208
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so209
-%if ! 0%{?sles_version}210
%dir %{_datadir}/ADM6_addons211
%dir %{_datadir}/ADM6_addons/avsfilter212
%{_datadir}/ADM6_addons/avsfilter/avsload.exe213
%{_datadir}/ADM6_addons/avsfilter/pipe_source.dll214
+%if ! 0%{?sles_version}215
%{_datadir}/pixmaps/avidemux3.png216
%endif217
%{_mandir}/man1/avidemux.1.gz218
219
%{_libdir}/libADM_render6_cli.so220
%{_libdir}/libADM_UI_Cli6.so221
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_cli.so222
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftCli.so223
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastCli.so224
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_CropCli.so225
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Cli.so226
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueCli.so227
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoCli.so228
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_cli.so229
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_cli.so230
+%dir %{_libdir}/ADM_plugins6/videoFilters/cli231
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so232
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so233
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so234
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so235
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so236
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so237
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so238
239
%if ! 0%{?sles_version}240
%files gtk241
242
%{_libdir}/ADM_glade/videoFilter/up.png243
%{_libdir}/ADM_glade/videoFilter/videoFilter.gtkBuilder244
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_gtk.so245
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_asharpGtk.so246
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftGtk.so247
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastGtk.so248
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_cropGtk.so249
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Gtk.so250
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueGtk.so251
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_gtk.so252
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_gtk.so253
+%dir %{_libdir}/ADM_plugins6/videoFilters/gtk254
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_asharpGtk.so255
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_chromaShiftGtk.so256
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_contrastGtk.so257
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_cropGtk.so258
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_eq2Gtk.so259
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_HueGtk.so260
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_swscaleResize_gtk.so261
%{_datadir}/applications/avidemux3-gtk.desktop262
263
%files qt4264
%defattr(-,root,root)265
-%{_bindir}/avidemux3_jobs266
+%{_bindir}/avidemux3_jobs_qt4267
%{_bindir}/avidemux3_qt4268
-%{_libdir}/libADM_render6_qt4.so269
+%{_libdir}/libADM_render6_QT4.so270
%{_libdir}/libADM_UIQT46.so271
-%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_qt4.so272
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_asharpQt4.so273
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftQt4.so274
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastQt4.so275
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_cropQt4.so276
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Qt4.so277
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_glBenchmark.so278
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_glResize.so279
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueQt4.so280
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoQt4.so281
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotateGlFrag2.so282
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sampleGlFrag2.so283
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sampleGlVertex.so284
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_qt4.so285
+%dir %{_libdir}/ADM_plugins6/scriptEngines/qt4286
+%dir %{_libdir}/ADM_plugins6/videoEncoders/qt4287
+%dir %{_libdir}/ADM_plugins6/videoFilters/qt4288
+%{_libdir}/ADM_plugins6/scriptEngines/qt4/libadm_script_QT4.so289
+%{_libdir}/ADM_plugins6/videoEncoders/qt4/libADM_ve_x264_QT4.so290
+%{_libdir}/ADM_plugins6/videoEncoders/qt4/libADM_ve_x265_QT4.so291
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_asharpQT4.so292
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_chromaShiftQT4.so293
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_contrastQT4.so294
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_cropQT4.so295
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_eq2QT4.so296
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_glBenchmark.so297
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_glResize.so298
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_HueQT4.so299
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_mpdelogoQT4.so300
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_rotateGlFrag2.so301
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlFrag2.so302
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlVertex.so303
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_swscaleResizeQT4.so304
%{_datadir}/applications/avidemux3-qt4.desktop305
306
%files -n avidemux3-qt4-lang307
%defattr(-,root,root)308
-%{_datadir}/avidemux3/i18n/309
+%dir %{_datadir}/avidemux3/qt4310
+%{_datadir}/avidemux3/qt4/i18n/311
312
%files help313
%defattr(-,root,root)314
avidemux-ADM_VERSION.patch
Added
23
1
2
+--- avidemux/common/main.cpp.orig 2014-11-28 22:27:34.739989392 +01003
++++ avidemux/common/main.cpp 2014-11-28 22:27:19.253254919 +01004
+@@ -137,7 +137,7 @@5
+ int startAvidemux(int argc, char *argv[])6
+ {7
+ printf("*************************\n");8
+- printf(" Avidemux v"ADM_VERSION);9
++ printf(" Avidemux v",ADM_VERSION);10
+ 11
+ #if defined( ADM_SUBVERSION )12
+ #define MKSTRING(x) x13
+--- avidemux/gtk/CMakeLists.txt.orig 2014-11-28 22:42:25.006820533 +010014
++++ avidemux/gtk/CMakeLists.txt 2014-11-28 22:42:25.039819908 +010015
+@@ -34,6 +34,7 @@16
+ 17
+ SDLify(../common/main.cpp)18
+ ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")19
++ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")20
+ 21
+ ###########################################22
+ # Version Info23
avidemux-bootStrap.patch
Changed
22
1
2
---- bootStrap.bash.orig 2014-03-12 07:15:23.000000000 +01003
-+++ bootStrap.bash 2014-10-16 13:17:27.202466100 +02004
-@@ -12,6 +12,7 @@5
- export O_PARAL="-j 2"6
- fail()7
- {8
-+ cat /tmp/log$BUILDDIR9
- echo "** Failed at $1**"10
- exit 111
- }12
+--- bootStrap.bash.orig 2014-11-28 22:27:34.749989459 +010013
++++ bootStrap.bash 2014-11-28 22:27:19.100257535 +010014
+@@ -12,6 +12,7 @@15
+ export O_PARAL="-j 2"16
+ fail()17
+ {18
++ cat /tmp/log$BUILDDIR19
+ echo "** Failed at $1**"20
+ exit 121
+ }22
avidemux-cmake-2.8.8.patch
Changed
9
1
2
---- cmake/admCheckRequiredLibs.cmake.orig 2012-11-24 14:10:22.875484974 +01003
-+++ cmake/admCheckRequiredLibs.cmake 2012-11-24 14:10:22.887484974 +01004
+--- cmake/admCheckRequiredLibs.cmake.orig 2014-11-28 22:27:34.748989455 +01005
++++ cmake/admCheckRequiredLibs.cmake 2014-11-28 22:27:19.127257073 +01006
@@ -16,9 +16,9 @@7
endif (DEFINED PKGCONFIG_FOUND)8
endif (${CMAKE_VERSION} VERSION_EQUAL 2.8.8)9
avidemux-cpu_armel.patch
Changed
9
1
2
---- avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt.orig 2014-11-06 19:55:57.065531381 +01003
-+++ avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2014-11-06 19:55:57.085531012 +01004
+--- avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt.orig 2014-11-28 22:27:34.742989408 +01005
++++ avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2014-11-28 22:27:19.752246386 +01006
@@ -6,6 +6,8 @@7
ADD_DEFINITIONS("-DFPM_DEFAULT")8
ELSEIF (ADM_CPU_PPC)9
avidemux-linking.patch
Changed
73
1
2
---- avidemux/cli/CMakeLists.txt.orig 2013-12-06 07:33:08.000000000 +01003
-+++ avidemux/cli/CMakeLists.txt 2013-12-09 11:37:09.197249000 +01004
-@@ -102,6 +102,16 @@5
+--- avidemux/cli/CMakeLists.txt.orig 2014-11-28 22:27:34.737989374 +01006
++++ avidemux/cli/CMakeLists.txt 2014-11-28 22:27:19.740246591 +01007
+@@ -80,6 +80,16 @@8
)9
10
###########################################11
12
# External libs13
###########################################14
# gettext15
---- avidemux/gtk/CMakeLists.txt.orig 2013-12-06 07:33:08.000000000 +010016
-+++ avidemux/gtk/CMakeLists.txt 2013-12-09 11:37:11.447018600 +010017
+--- avidemux/gtk/CMakeLists.txt.orig 2014-11-28 22:27:34.739989392 +010018
++++ avidemux/gtk/CMakeLists.txt 2014-11-28 22:27:19.744246523 +010019
@@ -102,6 +102,16 @@20
)21
22
23
# External libs24
###########################################25
# gettext26
---- avidemux/qt4/CMakeLists.txt.orig 2013-12-06 07:33:08.000000000 +010027
-+++ avidemux/qt4/CMakeLists.txt 2013-12-09 11:37:13.759281800 +010028
-@@ -140,6 +140,16 @@29
+--- avidemux/qt4/CMakeLists.txt.orig 2014-11-28 22:27:34.741989405 +010030
++++ avidemux/qt4/CMakeLists.txt 2014-11-28 22:27:19.746246489 +010031
+@@ -118,6 +118,16 @@32
)33
34
###########################################35
+# Missing libs36
+###########################################37
-+TARGET_LINK_LIBRARIES(avidemux3_qt438
++TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION}39
+ ADM_coreSqlLight340
+ ADM_libswscale41
+ ADM_libpostproc42
43
# External libs44
###########################################45
# gettext46
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig 2013-12-06 07:33:08.000000000 +010047
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2013-12-09 11:37:16.040298200 +010048
-@@ -90,6 +90,16 @@49
- TARGET_LINK_LIBRARIES(avidemux3_jobs ADM_coreJobs)50
- TARGET_LINK_LIBRARIES(avidemux3_jobs ADM_coreUtils6)51
- TARGET_LINK_LIBRARIES(avidemux3_jobs ADM_core6)52
+--- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig 2015-02-10 07:29:57.000000000 +010053
++++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2015-02-11 13:46:33.536379900 +010054
+@@ -67,6 +67,16 @@55
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)56
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)57
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_core6)58
+###########################################59
+# Missing libs60
+###########################################61
-+TARGET_LINK_LIBRARIES(avidemux3_jobs62
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION}63
+ ADM_coreSqlLight364
+ ADM_coreUI665
+ ADM_libavcodec66
67
+)68
+69
#70
- target_link_libraries(avidemux3_jobs "-lm -lstdc++")71
+ target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")72
#73
avidemux-package_version.patch
Changed
122
1
2
---- avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig 2014-03-14 13:16:11.948145100 +01003
-+++ avidemux/qt4/ADM_userInterfaces/ui_support.cpp 2014-03-14 13:34:19.661718900 +01004
-@@ -95,12 +95,12 @@5
- }6
- ADM_info("Initializing language %s\n",lang);7
- #ifdef __APPLE__8
-- QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/i18n/";9
-+ QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux3/i18n/";10
- 11
- #elif defined(_WIN32)12
- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";13
- #else14
-- QString appdir = ADM_getInstallRelativePath("share","avidemux6","i18n");15
-+ QString appdir = ADM_getInstallRelativePath("share","avidemux3","i18n");16
- #endif17
- QString languageFile=QString(lang);18
- int nbLoaded=0;19
---- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig 2014-03-14 13:19:05.743017000 +010020
-+++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2014-03-14 13:34:21.849218900 +010021
+diff -uNr avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp22
+--- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig 2015-03-07 18:10:59.000000000 +010023
++++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2015-03-07 18:51:50.109120416 +010024
@@ -143,7 +143,7 @@25
QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();26
#else27
28
#endif29
30
QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));31
---- avidemux_core/ADM_core/src/ADM_fileio.cpp.orig 2014-03-14 13:21:28.788976500 +010032
-+++ avidemux_core/ADM_core/src/ADM_fileio.cpp 2014-03-14 13:34:24.302343900 +010033
+diff -uNr avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig avidemux/qt4/ADM_userInterfaces/ui_support.cpp34
+--- avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig 2015-03-07 18:10:59.000000000 +010035
++++ avidemux/qt4/ADM_userInterfaces/ui_support.cpp 2015-03-07 18:51:50.163119306 +010036
+@@ -104,12 +104,12 @@37
+ 38
+ 39
+ #ifdef __APPLE__40
+- QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/"+QString(partialPath.c_str());41
++ QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux3/"+QString(partialPath.c_str());42
+ 43
+ #elif defined(_WIN32)44
+ QString appdir = QCoreApplication::applicationDirPath() + QString(partialPath.c_str());45
+ #else46
+- QString appdir = ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());47
++ QString appdir = ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());48
+ #endif49
+ QString languageFile=QString(lang);50
+ int nbLoaded=0;51
+diff -uNr avidemux_core/ADM_core/src/ADM_fileio.cpp.orig avidemux_core/ADM_core/src/ADM_fileio.cpp52
+--- avidemux_core/ADM_core/src/ADM_fileio.cpp.orig 2015-03-07 18:10:59.000000000 +010053
++++ avidemux_core/ADM_core/src/ADM_fileio.cpp 2015-03-07 18:51:50.858105023 +010054
@@ -463,9 +463,9 @@55
else56
ADM_DIR_NAME = "avidemux";57
58
#endif59
60
strcat(ADM_basedir, ADM_DIR_NAME);61
---- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig 2014-03-14 13:23:56.381781900 +010062
-+++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2014-03-14 13:34:26.489843900 +010063
+diff -uNr avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp64
+--- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig 2015-03-07 18:10:59.000000000 +010065
++++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2015-03-07 18:51:54.903021895 +010066
@@ -260,7 +260,7 @@67
this->callEventHandlers(IScriptEngine::Information, NULL, -1,68
(string("Executing ") + string(name) + string("...")).c_str());69
70
71
this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");72
73
---- cmake/se_plugin.cmake.orig 2014-03-14 13:26:16.005888300 +010074
-+++ cmake/se_plugin.cmake 2014-03-14 13:34:28.724218900 +010075
-@@ -12,7 +12,7 @@76
+diff -uNr cmake/se_plugin.cmake.orig cmake/se_plugin.cmake77
+--- cmake/se_plugin.cmake.orig 2015-03-07 18:10:59.000000000 +010078
++++ cmake/se_plugin.cmake 2015-03-07 18:51:56.589987225 +010079
+@@ -15,7 +15,7 @@80
if (WIN32)81
set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")82
else (WIN32)83
84
+ set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/help/${_engineName}")85
endif (WIN32)86
87
- install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}")88
---- cmake/Ts.cmake.orig 2014-03-14 13:30:09.942968900 +010089
-+++ cmake/Ts.cmake 2014-03-14 13:34:30.583593900 +010090
-@@ -41,7 +41,7 @@91
- IF(WIN32)92
- SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")93
- ELSE(WIN32)94
-- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/i18n")95
-+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/i18n")96
- ENDIF(WIN32)97
- INSTALL(FILES ${_files} DESTINATION "${i18dir}")98
- ENDMACRO(INSTALL_I18N _files)99
---- cmake/sql/update.sh.orig 2014-03-14 13:31:34.614843900 +0100100
-+++ cmake/sql/update.sh 2014-03-14 13:34:32.864843900 +0100101
+ install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)102
+diff -uNr cmake/sql/update.sh.orig cmake/sql/update.sh103
+--- cmake/sql/update.sh.orig 2015-03-07 18:10:59.000000000 +0100104
++++ cmake/sql/update.sh 2015-03-07 18:51:56.393991253 +0100105
@@ -1,3 +1,3 @@106
-sqlite3 ~/.avidemux6/jobs.sql .d > dump107
+sqlite3 ~/.avidemux3/jobs.sql .d > dump108
#sql2class -sqlite -global -license -wrapped -lib $PWD dump109
sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump110
+diff -uNr cmake/Ts.cmake.orig cmake/Ts.cmake111
+--- cmake/Ts.cmake.orig 2015-03-07 18:10:59.000000000 +0100112
++++ cmake/Ts.cmake 2015-03-07 18:51:56.421990678 +0100113
+@@ -41,7 +41,7 @@114
+ IF(WIN32)115
+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")116
+ ELSE(WIN32)117
+- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")118
++ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")119
+ ENDIF(WIN32)120
+ INSTALL(FILES ${_files} DESTINATION "${i18dir}" COMPONENT runtime)121
+ ENDMACRO(INSTALL_I18N _files)122
avidemux-x264_plugins.patch
Changed
12
1
2
---- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig 2013-05-11 19:57:12.944707623 +02003
-+++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2013-05-11 19:57:12.973707063 +02004
+--- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig 2015-02-23 18:53:40.000000000 +01005
++++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2015-02-26 14:06:02.512830400 +01006
@@ -27,15 +27,26 @@7
- INSTALL_VIDEO_ENCODER(ADM_ve_x264_qt4)8
+ INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION})9
endif(DO_QT4)10
#-----------------------/QT4 VERSION---------------------11
- #-----------------------GTK or CLI VERSION---------------------12
avidemux-x265_plugins.patch
Added
40
1
2
+--- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig 2015-02-23 18:53:40.000000000 +01003
++++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2015-02-26 14:06:03.794031200 +01004
+@@ -27,15 +27,26 @@5
+ INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})6
+ endif(DO_QT4)7
+ #-----------------------/QT4 VERSION---------------------8
+- #-----------------------GTK or CLI VERSION---------------------9
+- if((DO_GTK) OR (DO_CLI))10
+- ADD_VIDEO_ENCODER(ADM_ve_x265_other ADM_x265_noui.cpp ${x265_SRCS})11
+- ADD_TARGET_CFLAGS(ADM_ve_x265_other "-DADM_UI_TYPE_BUILD=1") # CLI!12
+- TARGET_LINK_LIBRARIES(ADM_ve_x265_other "${X265_LIBRARY_DIR}")13
+- TARGET_LINK_LIBRARIES(ADM_ve_x265_other ADM_core6)14
+- INIT_VIDEO_ENCODER(ADM_ve_x265_other)15
+- INSTALL_VIDEO_ENCODER(ADM_ve_x265_other)16
+- endif((DO_GTK) OR (DO_CLI))17
++ #-----------------------CLI VERSION----------------------18
++ if(DO_CLI)19
++ ADD_VIDEO_ENCODER(ADM_ve_x265_cli ADM_x265_noui.cpp ${x265_SRCS})20
++ ADD_TARGET_CFLAGS(ADM_ve_x265_cli "-DADM_UI_TYPE_BUILD=1") # CLI!21
++ TARGET_LINK_LIBRARIES(ADM_ve_x265_cli "${X265_LIBRARY_DIR}")22
++ TARGET_LINK_LIBRARIES(ADM_ve_x265_cli ADM_core6)23
++ INIT_VIDEO_ENCODER(ADM_ve_x265_cli)24
++ INSTALL_VIDEO_ENCODER(ADM_ve_x265_cli)25
++ endif(DO_CLI)26
++ #-----------------------/CLI VERSION---------------------27
++ #-----------------------GTK VERSION----------------------28
++ if(DO_GTK)29
++ ADD_VIDEO_ENCODER(ADM_ve_x265_gtk ADM_x265_noui.cpp ${x265_SRCS})30
++ ADD_TARGET_CFLAGS(ADM_ve_x265_gtk "-DADM_UI_TYPE_BUILD=1") # GTK!31
++ TARGET_LINK_LIBRARIES(ADM_ve_x265_gtk "${X265_LIBRARY_DIR}")32
++ TARGET_LINK_LIBRARIES(ADM_ve_x265_gtk ADM_core6)33
++ INIT_VIDEO_ENCODER(ADM_ve_x265_gtk)34
++ INSTALL_VIDEO_ENCODER(ADM_ve_x265_gtk)35
++ endif(DO_GTK)36
++ #-----------------------/GTK VERSION---------------------37
+ # ------------- PRESET -----------38
+ if(DO_SETTINGS)39
+ FILE(GLOB json_files ${CMAKE_CURRENT_SOURCE_DIR}/preset/*.json)40
config.mak.diff
Changed
11
1
2
---- config.mak.orig 2014-10-14 00:23:55.903217057 +02003
-+++ config.mak 2014-10-14 00:23:55.919216855 +02004
-@@ -94,7 +94,7 @@5
+--- config.mak.orig 2015-03-20 14:48:40.000000000 +01006
++++ config.mak 2015-03-20 14:57:19.669816100 +01007
+@@ -100,7 +100,7 @@8
EXEOBJS=9
INSTALL=install10
LIBTARGET=11
libavcodec_mpeg12enc.c.patch
Added
161
1
2
+--- libavcodec/mpeg12enc.c.orig 2015-06-10 23:35:03.625383207 +02003
++++ libavcodec/mpeg12enc.c 2015-06-10 23:35:03.661382526 +02004
+@@ -254,7 +254,7 @@5
+ 6
+ put_sbits(&s->pb, 12, s->width & 0xFFF);7
+ put_sbits(&s->pb, 12, s->height & 0xFFF);8
+-9
++#if 0 // MEANX10
+ for (i = 1; i < 15; i++) {11
+ int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;12
+ if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)13
+@@ -269,12 +269,41 @@14
+ s->aspect_ratio_info = i;15
+ }16
+ }17
++#endif // MEANX18
++ // MEANX put_bits(&s->pb, 4, s->aspect_ratio_info);19
++ // MEANX put_bits(&s->pb, 4, s->frame_rate_index);20
++ // MEANX 4:321
++ if(s->avctx->sample_aspect_ratio.num==16 && s->avctx->sample_aspect_ratio.den==9)22
++ {23
++ //printf("FFmpeg : Wide\n");24
++ put_bits(&s->pb,4,3); //16:925
++ }26
++ else //4:327
++ {28
++ if(s->codec_id == CODEC_ID_MPEG2VIDEO)29
++ put_bits(&s->pb, 4, 2);30
++ else31
++ put_bits(&s->pb, 4, 12); // MPEG132
++ }33
++ // /MEANX34
++// MEANX : Pulldown35
++ if((s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) && (s->codec_id == CODEC_ID_MPEG2VIDEO))36
++ { 37
++ put_bits(&s->pb, 4,4);38
++ }39
++ else40
++ { 41
++ put_bits(&s->pb, 4, s->frame_rate_index);42
++ } //MEANX pulldown43
++44
++ // MEANX if(s->avctx->rc_max_rate){45
++ // MEANX v = (s->avctx->rc_max_rate + 399) / 400;46
++ // MEANX if(s->avctx->rc_max_rate_header){ //MEANX we use header47
++ // MEANX v = (s->avctx->rc_max_rate_header + 399) / 400;48
++ if(s->avctx->rc_buffer_size_header) // MEANX we use header49
++ {50
++ vbv_buffer_size = s->avctx->rc_buffer_size_header;51
+ 52
+- put_bits(&s->pb, 4, s->aspect_ratio_info);53
+- put_bits(&s->pb, 4, s->frame_rate_index);54
+-55
+- if (s->avctx->rc_max_rate) {56
+- v = (s->avctx->rc_max_rate + 399) / 400;57
+ if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)58
+ v = 0x3ffff;59
+ } else {60
+@@ -324,7 +353,19 @@61
+ put_bits(&s->pb, 3, s->avctx->profile); // profile62
+ put_bits(&s->pb, 4, s->avctx->level); // level63
+ 64
+- put_bits(&s->pb, 1, s->progressive_sequence);65
++ // MEANX pulldown put_bits(&s->pb, 1, s->progressive_sequence);66
++ // MEANX Pulldown67
++ if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) //MEANX68
++ put_bits(&s->pb, 1, 0);69
++ else70
++ put_bits(&s->pb, 1, s->progressive_sequence);71
++72
++73
++// /MEANX74
++75
++76
++77
++// MEANX put_bits(&s->pb, 1, s->progressive_sequence);78
+ put_bits(&s->pb, 2, s->chroma_format);79
+ put_bits(&s->pb, 2, s->width >> 12);80
+ put_bits(&s->pb, 2, s->height >> 12);81
+@@ -425,6 +466,7 @@82
+ 83
+ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)84
+ {85
++ int tff, rff; //MEANX86
+ AVFrameSideData *side_data;87
+ mpeg1_encode_sequence_header(s);88
+ 89
+@@ -463,6 +505,46 @@90
+ 91
+ s->frame_pred_frame_dct = 1;92
+ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {93
++// MEANX94
++ if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN)95
++ {96
++ 97
++ switch((s->picture_number - 98
++ s->gop_picture_number)&3)99
++ {100
++ case 0:101
++ default:102
++ rff=1;103
++ tff=1;104
++ break;105
++ case 1:106
++ rff=0;107
++ tff=0;108
++ break;109
++ case 2:110
++ rff=1;111
++ tff=0;112
++ break;113
++ case 3:114
++ rff=0;115
++ tff=1;116
++ break;117
++ } 118
++ }119
++ else120
++ {121
++ if (s->progressive_sequence) 122
++ {123
++ tff=0; /* no repeat */124
++ } else 125
++ {126
++ tff=s->current_picture_ptr->f->top_field_first;127
++ }128
++ rff=s->repeat_first_field;129
++ 130
++ }131
++132
++// /MEANX133
+ put_header(s, EXT_START_CODE);134
+ put_bits(&s->pb, 4, 8); /* pic ext */135
+ if (s->pict_type == AV_PICTURE_TYPE_P ||136
+@@ -482,10 +564,14 @@137
+ 138
+ av_assert0(s->picture_structure == PICT_FRAME);139
+ put_bits(&s->pb, 2, s->picture_structure);140
++#if 0 // MEANX141
+ if (s->progressive_sequence)142
+ put_bits(&s->pb, 1, 0); /* no repeat */143
+ else144
+ put_bits(&s->pb, 1, s->current_picture_ptr->f->top_field_first);145
++#endif // MEANX146
++ put_bits(&s->pb, 1, tff); //MEANX PULLDOWN147
++148
+ /* XXX: optimize the generation of this flag with entropy measures */149
+ s->frame_pred_frame_dct = s->progressive_sequence;150
+ 151
+@@ -494,7 +580,8 @@152
+ put_bits(&s->pb, 1, s->q_scale_type);153
+ put_bits(&s->pb, 1, s->intra_vlc_format);154
+ put_bits(&s->pb, 1, s->alternate_scan);155
+- put_bits(&s->pb, 1, s->repeat_first_field);156
++ // MEANX put_bits(&s->pb, 1, s->top_field_first);157
++ put_bits(&s->pb, 1, rff); // MEANX158
+ s->progressive_frame = s->progressive_sequence;159
+ /* chroma_420_type */160
+ put_bits(&s->pb, 1, s->chroma_format ==161
libavcodec_mpegvideo_enc.c.patch
Added
39
1
2
+--- libavcodec/mpegvideo_enc.c.orig 2015-06-10 20:53:04.066303738 +02003
++++ libavcodec/mpegvideo_enc.c 2015-06-10 20:57:27.692337620 +02004
+@@ -469,14 +469,14 @@5
+ "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "6
+ "specified vbv buffer is too large for the given bitrate!\n");7
+ }8
+-9
++#if 0 // MEANX10
+ if ((s->avctx->flags & CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&11
+ s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&12
+ s->codec_id != AV_CODEC_ID_FLV1) {13
+ av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");14
+ return -1;15
+ }16
+-17
++#endif18
+ if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {19
+ av_log(avctx, AV_LOG_ERROR,20
+ "OBMC is only supported with simple mb decision\n");21
+@@ -568,7 +568,7 @@22
+ av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");23
+ return -1;24
+ }25
+-26
++#if 0 // MEANX27
+ // FIXME mpeg2 uses that too28
+ if (s->mpeg_quant && ( s->codec_id != AV_CODEC_ID_MPEG429
+ && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {30
+@@ -576,7 +576,7 @@31
+ "mpeg2 style quantization not supported by codec\n");32
+ return -1;33
+ }34
+-35
++#endif36
+ if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {37
+ av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");38
+ return -1;39
libavcodec_put_bits.h.patch
Added
15
1
2
+--- libavcodec/put_bits.h~ 2014-12-03 22:30:33.639552235 +01003
++++ libavcodec/put_bits.h 2014-12-03 22:30:33.664551595 +01004
+@@ -33,6 +33,10 @@5
+ #include "libavutil/intreadwrite.h"6
+ #include "libavutil/avassert.h"7
+ 8
++#ifndef ADM_LAV_NO_CONFIG9
++ #include "config.h"10
++#endif// ADM_LAV_NO_CONFIG11
++ 12
+ typedef struct PutBitContext {13
+ uint32_t bit_buf;14
+ int bit_left;15
libavcodec_x86_fmtconvert_init.c.patch
Added
19
1
2
+--- libavcodec/x86/fmtconvert_init.c.orig 2015-03-07 23:34:54.380084981 +01003
++++ libavcodec/x86/fmtconvert_init.c 2015-03-07 23:34:54.416084278 +01004
+@@ -44,6 +44,7 @@5
+ #if HAVE_YASM6
+ int cpu_flags = av_get_cpu_flags();7
+ 8
++#if 0 // MEANX : Cant guarantee proper alignment9
+ if (EXTERNAL_SSE(cpu_flags)) {10
+ c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse;11
+ c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse;12
+@@ -52,5 +53,6 @@13
+ c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2;14
+ c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse2;15
+ }16
++#endif // MEANX17
+ #endif /* HAVE_YASM */18
+ }19
avidemux_2.6.8.tar.gz -> avidemux_2.6.10.tar.gz
Changed
ffmpeg-1.2.12.tar.bz2 -> ffmpeg-2.7.1.tar.bz2
Changed
Refresh
No build results available
Refresh
No rpmlint results available
Login required, please
login
or
signup
in order to comment
Request History
enzokiel created request almost 10 years ago
- Update to version 2.6.10
enzokiel accepted request almost 10 years ago
OK