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.
Changes of Revision 4
avidemux3.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sat Feb 01 2014 - joerg.lorenzen@ki.tng.de4
+- update internal ffmpeg to version 1.2.55
+6
+-------------------------------------------------------------------7
Mon Dec 09 2013 - joerg.lorenzen@ki.tng.de8
- Update to version 2.6.79
* [MKV] Fix seeking in h26410
11
* [Build] Support for newer cmake (ajschult)12
* [Build] Better RPM generation (mit)13
* [Auto/PSP] Fixed scripts (LJ)14
+15
-------------------------------------------------------------------16
Sat Nov 02 2013 - joerg.lorenzen@ki.tng.de17
- changes in spec file to enable build for openSUSE 11.4 and 12.118
+19
-------------------------------------------------------------------20
Wed Oct 30 2013 - joerg.lorenzen@ki.tng.de21
- Initial package, version 2.6.622
avidemux3.spec
Changed
33
1
2
#3
4
5
+%define ffmpeg_version 1.2.56
+7
Name: avidemux38
Summary: Graphical video editing and transcoding tool9
Version: 2.6.710
11
Source0: avidemux_%{version}.tar.gz12
Source1: avidemux3-qt4.desktop13
Source2: avidemux3-gtk.desktop14
+Source3: ffmpeg-%{ffmpeg_version}.tar.bz215
+Source4: xvba_support_from_xbmc_xvba.patch16
Patch0: avidemux-cmake-2.8.8.patch17
Patch1: avidemux-linking.patch18
Patch2: avidemux-x264_plugins.patch19
20
%prep21
%setup -q -n avidemux_%{version}22
find . -type f -exec dos2unix -q {} \;23
+sed -i -e 's|set(FFMPEG_VERSION "1.2.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake24
+rm -f avidemux_core/ffmpeg_package/ffmpeg-1.2.1.tar.bz225
+cp %{S:3} avidemux_core/ffmpeg_package/26
+pushd avidemux_core/ffmpeg_package/patches/xvba27
+rm -f xvba_support_from_xbmc_xvba.patch28
+cp %{S:4} .29
+popd30
%patch0 -p031
%patch1 -p032
%patch2 -p033
xvba_support_from_xbmc_xvba.patch
Added
201
1
2
+diff --git a/configure b/configure3
+index d557cac..ba1f392 1007554
+--- a/configure5
++++ b/configure6
+@@ -144,6 +144,7 @@7
+ --disable-vaapi disable VAAPI code [autodetect]8
+ --enable-vda enable VDA code9
+ --disable-vdpau disable VDPAU code [autodetect]10
++ --disable-xvba disable XVBA code11
+ 12
+ Individual component options:13
+ --disable-everything disable all components listed below14
+@@ -1216,6 +1217,7 @@15
+ vaapi16
+ vda17
+ vdpau18
++ xvba19
+ "20
+ 21
+ LIBRARY_LIST="22
+@@ -1845,6 +1847,7 @@23
+ dxva2_deps="dxva2api_h"24
+ vaapi_deps="va_va_h"25
+ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"26
++xvba_deps="amd_amdxvba_h"27
+ vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"28
+ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"29
+ 30
+@@ -1865,6 +1868,8 @@31
+ h264_vdpau_decoder_select="h264_decoder"32
+ h264_vdpau_hwaccel_deps="vdpau"33
+ h264_vdpau_hwaccel_select="h264_decoder"34
++h264_xvba_hwaccel_select="h264_decoder"35
++h264_xvba_hwaccel_deps="xvba"36
+ mpeg_vdpau_decoder_deps="vdpau"37
+ mpeg_vdpau_decoder_select="mpegvideo_decoder"38
+ mpeg1_vdpau_decoder_deps="vdpau"39
+@@ -1877,6 +1882,8 @@40
+ mpeg2_vaapi_hwaccel_deps="vaapi"41
+ mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"42
+ mpeg2_vdpau_hwaccel_deps="vdpau"43
++mpeg2_xvba_hwaccel_select="mpeg2video_decoder"44
++mpeg2_xvba_hwaccel_deps="xvba"45
+ mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"46
+ mpeg4_crystalhd_decoder_select="crystalhd"47
+ mpeg4_vaapi_hwaccel_deps="vaapi"48
+@@ -1895,11 +1902,14 @@49
+ vc1_vdpau_decoder_select="vc1_decoder"50
+ vc1_vdpau_hwaccel_deps="vdpau"51
+ vc1_vdpau_hwaccel_select="vc1_decoder"52
++vc1_xvba_hwaccel_select="vc1_decoder"53
++vc1_xvba_hwaccel_deps="xvba"54
+ wmv3_crystalhd_decoder_select="crystalhd"55
+ wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"56
+ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"57
+ wmv3_vdpau_decoder_select="vc1_vdpau_decoder"58
+ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"59
++wmv3_xvba_hwaccel_select="vc1_xvba_hwaccel"60
+ 61
+ # parsers62
+ h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"63
+@@ -3853,6 +3863,7 @@64
+ check_header unistd.h65
+ check_header vdpau/vdpau.h66
+ check_header vdpau/vdpau_x11.h67
++check_header amd/amdxvba.h68
+ check_header VideoDecodeAcceleration/VDADecoder.h69
+ check_header windows.h70
+ check_header X11/extensions/XvMClib.h71
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile72
+index dc065a5..c386923 10064473
+--- a/libavcodec/Makefile74
++++ b/libavcodec/Makefile75
+@@ -12,6 +12,7 @@ HEADERS = avcodec.h \76
+ vdpau.h \77
+ version.h \78
+ xvmc.h \79
++ xvba.h \80
+ 81
+ OBJS = allcodecs.o \82
+ audioconvert.o \83
+@@ -73,6 +74,7 @@ OBJS-$(CONFIG_SHARED) += log2_tab.o84
+ OBJS-$(CONFIG_SINEWIN) += sinewin.o85
+ OBJS-$(CONFIG_VAAPI) += vaapi.o86
+ OBJS-$(CONFIG_VDPAU) += vdpau.o87
++OBJS-$(CONFIG_XVBA) += xvba.o88
+ OBJS-$(CONFIG_VIDEODSP) += videodsp.o89
+ OBJS-$(CONFIG_VP3DSP) += vp3dsp.o90
+ 91
+@@ -232,6 +234,7 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o92
+ OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o93
+ OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o94
+ OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o95
++OBJS-$(CONFIG_H264_XVBA_HWACCEL) += xvba_h264.o96
+ OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o97
+ OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o98
+ OBJS-$(CONFIG_IAC_DECODER) += imc.o99
+@@ -295,6 +298,7 @@ OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \100
+ OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o101
+ OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o102
+ OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o103
++OBJS-$(CONFIG_MPEG2_XVBA_HWACCEL) += xvba_mpeg2.o104
+ OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o105
+ OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o \106
+ timecode.o107
+@@ -459,6 +463,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \108
+ OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o109
+ OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o110
+ OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o111
++OBJS-$(CONFIG_VC1_XVBA_HWACCEL) += xvba_vc1.o112
+ OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o113
+ OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o114
+ OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o115
+@@ -788,6 +793,7 @@ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h116
+ SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h117
+ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h118
+ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h119
++SKIPHEADERS-$(CONFIG_XVBA) += xvba_internal.h120
+ SKIPHEADERS-$(CONFIG_VDA) += vda.h121
+ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h122
+ SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h123
+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c124
+index 584446f..7a8f61c 100644125
+--- a/libavcodec/allcodecs.c126
++++ b/libavcodec/allcodecs.c127
+@@ -79,18 +79,22 @@ void avcodec_register_all(void)128
+ REGISTER_HWACCEL(H264_VAAPI, h264_vaapi);129
+ REGISTER_HWACCEL(H264_VDA, h264_vda);130
+ REGISTER_HWACCEL(H264_VDPAU, h264_vdpau);131
++ REGISTER_HWACCEL(H264_XVBA, h264_xvba);132
+ REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau);133
+ REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2);134
+ REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);135
+ REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);136
++ REGISTER_HWACCEL(MPEG2_XVBA, mpeg2_xvba);137
+ REGISTER_HWACCEL(MPEG4_VAAPI, mpeg4_vaapi);138
+ REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau);139
+ REGISTER_HWACCEL(VC1_DXVA2, vc1_dxva2);140
+ REGISTER_HWACCEL(VC1_VAAPI, vc1_vaapi);141
+ REGISTER_HWACCEL(VC1_VDPAU, vc1_vdpau);142
++ REGISTER_HWACCEL(VC1_XVBA, vc1_xvba);143
+ REGISTER_HWACCEL(WMV3_DXVA2, wmv3_dxva2);144
+ REGISTER_HWACCEL(WMV3_VAAPI, wmv3_vaapi);145
+ REGISTER_HWACCEL(WMV3_VDPAU, wmv3_vdpau);146
++ REGISTER_HWACCEL(WMV3_XVBA, wmv3_xvba);147
+ 148
+ /* video codecs */149
+ REGISTER_ENCODER(A64MULTI, a64multi);150
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c151
+index 3a83b4b..96b6c30 100644152
+--- a/libavcodec/h264.c153
++++ b/libavcodec/h264.c154
+@@ -81,6 +81,9 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = {155
+ #if CONFIG_H264_VDPAU_HWACCEL156
+ AV_PIX_FMT_VDPAU,157
+ #endif158
++#if CONFIG_H264_XVBA_HWACCEL159
++ AV_PIX_FMT_XVBA_VLD,160
++#endif161
+ AV_PIX_FMT_YUV420P,162
+ AV_PIX_FMT_NONE163
+ };164
+diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c165
+index 2130c74..4d611f9 100644166
+--- a/libavcodec/vc1dec.c167
++++ b/libavcodec/vc1dec.c168
+@@ -5807,6 +5807,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {169
+ #if CONFIG_VDPAU170
+ AV_PIX_FMT_VDPAU,171
+ #endif172
++#if CONFIG_XVBA173
++ AV_PIX_FMT_XVBA_VLD,174
++#endif175
+ AV_PIX_FMT_YUV420P,176
+ AV_PIX_FMT_NONE177
+ };178
+diff --git a/libavcodec/xvba.c b/libavcodec/xvba.c179
+new file mode 100644180
+index 0000000..c6ff2fe181
+--- /dev/null182
++++ b/libavcodec/xvba.c183
+@@ -0,0 +1,77 @@184
++/*185
++ * HW decode acceleration for MPEG-2, H.264 and VC-1186
++ *187
++ * Copyright (C) 2005-2011 Team XBMC188
++ *189
++ * This file is part of FFmpeg.190
++ *191
++ * FFmpeg is free software; you can redistribute it and/or192
++ * modify it under the terms of the GNU Lesser General Public193
++ * License as published by the Free Software Foundation; either194
++ * version 2.1 of the License, or (at your option) any later version.195
++ *196
++ * FFmpeg is distributed in the hope that it will be useful,197
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of198
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU199
++ * Lesser General Public License for more details.200
++ *201
ffmpeg-1.2.5.tar.bz2
Added