Packman Build Service PMBS

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 16

transcode.changes Changed

@@ -1,4 +1,42 @@
 -------------------------------------------------------------------
+Thu Jan  7 19:01:30 UTC 2016 - davejplater@gmail.com
+
+- Fixed 64 bit portability with transcode-fix-64bit-portability.patch
+
+-------------------------------------------------------------------
+Thu Jan  7 10:16:03 UTC 2016 - davejplater@gmail.com
+
+- Reverted to trancode-1.1.7 from gentoo
+- Added patches:
+  *transcode-export_ffmpeg.patch
+  *transcode-1.1.7-ffmpeg.patch
+  *transcode-1.1.7-ffmpeg-0.10.patch
+  *transcode-1.1.7-ffmpeg-0.11.patch
+  *transcode-1.1.7-preset-free.patch
+  *transcode-1.1.7-libav-9.patch
+  *transcode-1.1.7-preset-force.patch
+  *transcode-1.1.7-ffmpeg2.patch
+  *transcode-1.1.7-freetype251.patch
+  # ALTLinux patches
+  *transcode-1.1.7-libav-10.patch
+  *transcode-1.1.5-textrel.patch
+- Upstream changes:
+  transcode-1.1.7
+  *Update the video stabilization plugins to version 0.80.
+  transcode-1.1.6
+  *Fixed bugs: #16452, #16703, #16648, #16611, #16844
+  *tcdemux: fixed crash when using the new -A mode.
+  *x264: fix to work properly with libx264 >= 78;
+   require libx264 >= 66.
+  *Update the video stabilization plugins to version 0.79.
+  *Better maximum size detection for avisplit.
+  *EXPERIMENTAL ffmpeg encoder preset support.
+  *FFMpeg 0.8.x compatibility.
+  *video4linux: made the v1 and v2 modules independent.
+   v1 is deprecated.
+  *Backported various minor bugfixes from HEAD/default.
+
+-------------------------------------------------------------------
 Sat Dec 26 11:58:19 UTC 2015 - davejplater@gmail.com
 
 - Add links to versioned binaries to enable other programs ie.k3b

transcode.spec Changed

@@ -16,109 +16,212 @@
 #
 
 
-%bcond_without graphicsmagic
-%define sversion %(echo %{version}|cut -b 1-3)
+%define subver %{nil}
+%bcond_without a52
+%bcond_without imagemagick
+%bcond_without libdv
+%bcond_without libdvdread
+%bcond_without libfame
+%bcond_without libjpeg
+%bcond_without libquicktime
+%bcond_without libxml2
+%bcond_without lzo
+%bcond_without mjpegtools
+%bcond_without mmx
+%bcond_without netstream
+%bcond_without ogg
+%bcond_without sdl
+%bcond_without theora
+%bcond_without v4l
+%bcond_without vorbis
+%bcond_without libpostproc
+%bcond_without freetype2
+%bcond_without xvid
+%bcond_without x264
+%bcond_with pvm3
+%bcond_without libmpeg2
+%bcond_without alsa
+%bcond_without avifile
+%bcond_without ibp
+%bcond_without libmpeg3
+%bcond_without xio
 Name:           transcode
-Version:        1.2.0
+Version:        1.1.7
 Release:        0
 Summary:        A linux video stream processing utility
 Summary(de):    Das Schweizer Taschenmesser der Videobearbeitung
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Other
-Url:            https://bitbucket.org/achurch_/transcode/wiki/Home
-Source:         transcode-%{version}.tar.bz2
-Patch0:         transcode-cflags.patch
-BuildRequires:  aalib-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc-c++
+Url:            https://bitbucket.org/france/transcode-tcforge/overview
+Source:         %{name}-%{version}.tar.bz2
+Source2:        export_dvraw.c
+# Fix 64 bit portability issue in export_ffmpeg.c
+Patch1:         transcode-fix-64bit-portability.patch
+# http://article.gmane.org/gmane.comp.video.transcode.user/18434
+# http://article.gmane.org/gmane.comp.video.transcode.user/18381
+# http://article.gmane.org/gmane.comp.video.transcode.user/18446
+# Gentoo
+Patch0:         transcode-export_ffmpeg.patch
+Patch10:        transcode-1.1.7-ffmpeg.patch
+Patch11:        transcode-1.1.7-ffmpeg-0.10.patch
+Patch12:        transcode-1.1.7-ffmpeg-0.11.patch
+Patch13:        transcode-1.1.7-preset-free.patch
+Patch14:        transcode-1.1.7-libav-9.patch
+Patch15:        transcode-1.1.7-preset-force.patch
+Patch16:        transcode-1.1.7-ffmpeg2.patch
+Patch17:        transcode-1.1.7-freetype251.patch
+# ALTLinux patches
+Patch18:        transcode-1.1.7-libav-10.patch
+Patch98:        transcode-1.1.5-textrel.patch
 BuildRequires:  libtool
-BuildRequires:  pkg-config
-#
-BuildRequires:  libfaac-devel
+BuildRequires:  faac-devel
+BuildRequires:  glibc-devel
+BuildRequires:  imake
+BuildRequires:  ImageMagick-devel
+BuildRequires:  alsa-devel
+BuildRequires:  liba52-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmp3lame-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  lzo
-BuildRequires:  lzo-devel >= 2.01
-BuildRequires:  pvm-devel
-BuildRequires:  xorg-x11-devel
-BuildRequires:  zlib-devel
-%if %{with graphicsmagic}
-%if %{suse_version} < 1315
-# devel pkg lacks dependency on main pkg
-BuildRequires:  libGraphicsMagickWand2
-%endif
-BuildRequires:  pkgconfig(GraphicsMagickWand)
-%endif
-BuildRequires:  pkgconfig(liba52)
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(dvdread)
-BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  libtwolame-devel
+BuildRequires:  lzo-devel
+BuildRequires:  mjpegtools-devel
+BuildRequires:  libmpeg2-devel
+BuildRequires:  libnetpbm-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libpostproc-devel
+BuildRequires:  x264-devel >= 0.66
+BuildRequires:  xvid-devel
+BuildRequires:  xorg-cf-files
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
-BuildRequires:  pkgconfig(libavutil)
-BuildRequires:  pkgconfig(libdv)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpeg2convert)
+BuildRequires:  pkgconfig(libavresample)
 BuildRequires:  pkgconfig(libpostproc)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libdv)
+BuildRequires:  pkgconfig(dvdread)
+BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(libquicktime)
+BuildRequires:  pkgconfig(libv4l1)
 BuildRequires:  pkgconfig(libv4l2)
 BuildRequires:  pkgconfig(libv4lconvert)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(mjpegtools)
-BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(sdl)
-BuildRequires:  pkgconfig(shout)
 BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(theoradec)
+BuildRequires:  pkgconfig(theoraenc)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vorbisenc)
-BuildRequires:  pkgconfig(x264)
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(vorbisfile)
+BuildRequires:  pkgconfig(xaw6)
+BuildRequires:  pkgconfig(xaw7)
+BuildRequires:  pkgconfig(xpm)
+BuildRequires:  pkgconfig(xv)
 
 %description
-transcode is a text-console video stream processing tool. Decoding and encoding
-is done by loading shared library modules that are responsible for feeding
-transcode with raw RGB/PCM streams (import module) and encoding the frames
-(export module). It supports elementary video and audio frame transformations.
-Some example modules are included to enable import of MPEG program streams
-(VOB), Digital Video (DV), or YUV video and export modules for writing DivX;-),
-OpenDivX, or uncompressed AVI files.  A set of tools is available to extract
-and decode the sources into raw video/audio streams for import and to enable
-post-processing of AVI files.
+transcode  is a linux text-console utility for video stream
+processing.
+
+Decoding and encoding is done by loading modules that are
+responsible for feeding transcode with raw video/audio streams (import
+modules) and encoding the frames (export modules).
+
+It supports elementary video and audio frame transformations, including
+de-interlacing or fast resizing of video frames and loading of external
+filters.
+
+A number of modules are included to enable import of DVDs
+on-the-fly, MPEG elementary (ES) or program streams (VOB), MPEG video,
+Digital Video (DV), YUV4MPEG streams, NuppelVideo file format and raw or
+compressed (pass-through) video frames and export modules for writing
+DivX;-), OpenDivX, DivX 4.xx or uncompressed AVI files with MPEG, AC3
+(pass-through) or PCM audio. Additional export modules to write single
+frames (PPM) or YUV4MPEG streams are available, as well as an interface
+import module to the avifile library. It's modular concept is intended
+to provide flexibility and easy user extensibility to include other
+video/audio codecs or filetypes.
+
+A set of tools is included to demux (tcdemux), extract (tcextract) and
+decode (tcdecode) the sources into raw video/audio streams for import,
+probing (tcprobe) and scanning (tcscan) your sources and to enable
+post-processing of AVI files, fixing AVI file header information
+(avifix), merging multiple files (avimerge) or splitting large AVI files
+(avisplit) to fit on a CD.
 
 %description -l de
 Videokonverter mit sehr vielen input/output und filter plugins, kann auch zum
 encodieren von dvd's genutzt werden.
 
 %prep
-%setup -q
-%patch0 -p1
-echo %{sversion}
+%setup -q -n %{name}-%{version}%{subver}
+#
+install -m644 %{SOURCE2} filter/
+%patch0
+%patch10
+%patch11
+%patch12
+%patch13

transcode-1.1.5-textrel.patch Added

transcode-1.1.7-ffmpeg-0.10.patch Added

transcode-1.1.7-ffmpeg-0.11.patch Added

@@ -0,0 +1,306 @@
+Index: encode/encode_lavc.c
+===================================================================
+--- encode/encode_lavc.c.orig
++++ encode/encode_lavc.c
+@@ -114,6 +114,7 @@ struct tclavcprivatedata_ {
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
++    AVDictionary ** ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -1034,14 +1035,10 @@ static void tc_lavc_dispatch_settings(TC
+     SET_FLAG(pd, mv0);
+     SET_FLAG(pd, cbp);
+     SET_FLAG(pd, qpel);
+-    SET_FLAG(pd, alt);
+-    SET_FLAG(pd, vdpart);
+     SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+     SET_FLAG(pd, ildct);
+     SET_FLAG(pd, aic);
+-    SET_FLAG(pd, aiv);
+-    SET_FLAG(pd, umv);
+     SET_FLAG(pd, psnr);
+     SET_FLAG(pd, trell);
+     SET_FLAG(pd, gray);
+@@ -1062,6 +1059,18 @@ static void tc_lavc_dispatch_settings(TC
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     }
++    if (pd->confdata.flags.alt) {
++        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++    }
++    if (pd->confdata.flags.vdpart) {
++        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++    }
++    if (pd->confdata.flags.umv) {
++        av_dict_set(pd->ff_opts, "umv", "1", 0);
++    }
++    if (pd->confdata.flags.aiv) {
++        av_dict_set(pd->ff_opts, "aiv", "1", 0);
++    }
+ }
+ 
+ #undef SET_FLAG
+@@ -1180,18 +1189,18 @@ static int tc_lavc_read_config(TCLavcPri
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+-        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
++        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+         { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+         { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
+-        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
++        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
+ #else        
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
+ #endif
+-        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
+-        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
++        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
++        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+@@ -1383,7 +1392,7 @@ static int tc_lavc_configure(TCModuleIns
+                     pd->confdata.thread_count,
+                     (pd->confdata.thread_count > 1) ?"s" :"");
+     }
+-    avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
++    pd->ff_vcontext.thread_count = pd->confdata.thread_count;
+ 
+     pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
+     if (pd->ff_vcodec == NULL) {
+@@ -1393,11 +1402,11 @@ static int tc_lavc_configure(TCModuleIns
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
++    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
+     TC_UNLOCK_LIBAVCODEC;
+ 
+     if (ret < 0) {
+-        tc_log_error(MOD_NAME, "avcodec_open() failed");
++        tc_log_error(MOD_NAME, "avcodec_open2() failed");
+         goto failed;
+     }
+     /* finally, pass up the extradata, if any */
+Index: export/export_ffmpeg.c
+===================================================================
+--- export/export_ffmpeg.c.orig
++++ export/export_ffmpeg.c
+@@ -122,6 +122,7 @@ static uint8_t             *img_buffer =
+ static AVFrame             *lavc_convert_frame = NULL;
+ 
+ static AVCodec             *lavc_venc_codec = NULL;
++static AVDictionary        **lavc_venc_opts = NULL;
+ static AVFrame             *lavc_venc_frame = NULL;
+ static AVCodecContext      *lavc_venc_context;
+ static avi_t               *avifile = NULL;
+@@ -180,7 +181,7 @@ static char *tc_strchrnul(const char *s,
+ 
+ 
+ /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
+-#include <libavcodec/opt.h>
++#include <libavutil/opt.h>
+ #include <libavutil/avstring.h>
+ #include <libswscale/swscale.h>
+ 
+@@ -470,7 +471,6 @@ MOD_init
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    avcodec_init();
+     avcodec_register_all();
+     TC_UNLOCK_LIBAVCODEC;
+ 
+@@ -634,7 +634,7 @@ MOD_init
+         lavc_param_rc_max_rate = 2516;
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++        lavc_param_scan_offset = 1;
+ 
+         break;
+ 
+@@ -674,7 +674,7 @@ MOD_init
+ 
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
++        lavc_param_scan_offset = 1;
+ 
+         break;
+ 
+@@ -887,7 +887,7 @@ MOD_init
+ 		    lavc_venc_context->thread_count);
+     }
+ 
+-    avcodec_thread_init(lavc_venc_context, lavc_param_threads);
++    lavc_venc_context->thread_count = lavc_param_threads;
+ 
+     if (lavc_param_intra_matrix) {
+         char *tmp;
+@@ -1065,15 +1065,10 @@ MOD_init
+     lavc_venc_context->flags |= lavc_param_closedgop;
+     lavc_venc_context->flags |= lavc_param_trunc;
+     lavc_venc_context->flags |= lavc_param_aic;
+-    lavc_venc_context->flags |= lavc_param_umv;
+     lavc_venc_context->flags |= lavc_param_v4mv;
+-    lavc_venc_context->flags |= lavc_param_data_partitioning;
+     lavc_venc_context->flags |= lavc_param_cbp;
+     lavc_venc_context->flags |= lavc_param_mv0;
+     lavc_venc_context->flags |= lavc_param_qp_rd;
+-    lavc_venc_context->flags |= lavc_param_scan_offset;
+-    lavc_venc_context->flags |= lavc_param_ss;
+-    lavc_venc_context->flags |= lavc_param_alt;
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1203,7 +1198,6 @@ MOD_init
+ 
+     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+-
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+@@ -1241,20 +1235,39 @@ MOD_init
+ 		}
+ 	}
+ 
++    if (lavc_param_scan_offset) {
++      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
++    }
++
++    if (lavc_param_ss) {
++      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
++    }
++
++    if (lavc_param_alt) {
++      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
++    }
++
++    if (lavc_param_umv) {
++      av_dict_set(lavc_venc_opts, "umv", "1", 0);
++    }
++
++    if (lavc_param_data_partitioning) {
++      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
++    }
+ 
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;

transcode-1.1.7-ffmpeg.patch Added

@@ -0,0 +1,51 @@
+--- encode/encode_lavc.c
++++ encode/encode_lavc.c
+@@ -955,8 +955,6 @@
+     /* 
+      * context *transcode* (not libavcodec) defaults
+      */
+-    pd->ff_vcontext.mb_qmin                 = 2;
+-    pd->ff_vcontext.mb_qmax                 = 31;
+     pd->ff_vcontext.max_qdiff               = 3;
+     pd->ff_vcontext.max_b_frames            = 0;
+     pd->ff_vcontext.me_range                = 0;
+@@ -1116,8 +1114,6 @@
+         //  handled by transcode core
+         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         //  handled by transcode core
+-        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+-        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+--- export/ffmpeg_cfg.c
++++ export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -143,8 +141,6 @@
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+--- export/ffmpeg_cfg.h
++++ export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;

transcode-1.1.7-ffmpeg2.patch Added

@@ -0,0 +1,332 @@
+Fix build with ffmpeg-2.0.
+Fix segfaults introduced by wrong usage of the av_dict API.
+Fix forgotten parts in the libav9 patch.
+
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
+     int lmin;
+     int lmax;
+     int me_method;
++    int luma_elim_threshold;
++    int chroma_elim_threshold;
++    int quantizer_noise_shaping;
+ 
+     /* same as above for flags */
+     struct {
+@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
+-    AVDictionary ** ff_opts;
++    AVDictionary * ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
+     TC_CODEC_ERROR
+ };
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ static const enum CodecID tc_lavc_internal_codecs[] = {
+     CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
+     CODEC_ID_H263I, CODEC_ID_H263P,
+@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
+     CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
+     CODEC_ID_NONE
+ };
++#else
++static const enum AVCodecID tc_lavc_internal_codecs[] = {
++    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
++    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
++    AV_CODEC_ID_H264,
++    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
++    AV_CODEC_ID_RV10,
++    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
++    AV_CODEC_ID_DVVIDEO,
++    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
++    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
++    AV_CODEC_ID_NONE
++};
++#endif
+ 
+ static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
+ 
+@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
+ static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
+ {
+     /* first of all reinitialize lavc data */
++#if LIBAVCODEC_VERSION_MAJOR < 55
+     avcodec_get_context_defaults(&pd->ff_vcontext);
++#else
++    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
++#endif
+ 
+     pd->confdata.thread_count = 1;
+ 
+@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.mpeg_quant              = 0;
+     pd->ff_vcontext.rc_initial_cplx         = 0.0;
+     pd->ff_vcontext.rc_qsquish              = 1.0;
+-    pd->ff_vcontext.luma_elim_threshold     = 0;
+-    pd->ff_vcontext.chroma_elim_threshold   = 0;
++    pd->confdata.luma_elim_threshold     = 0;
++    pd->confdata.chroma_elim_threshold   = 0;
+     pd->ff_vcontext.strict_std_compliance   = 0;
+     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
+     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
+@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.noise_reduction         = 0;
+-    pd->ff_vcontext.quantizer_noise_shaping = 0;
++    pd->confdata.quantizer_noise_shaping = 0;
+     pd->ff_vcontext.flags                   = 0;
+ }
+ 
+@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
+ 
+     pd->ff_vcontext.flags = 0;
+     SET_FLAG(pd, mv0);
+-    SET_FLAG(pd, cbp);
+     SET_FLAG(pd, qpel);
+     SET_FLAG(pd, naq);
+     SET_FLAG(pd, ilme);
+@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
+         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     }
+     if (pd->confdata.flags.alt) {
+-        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
++        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+     }
+     if (pd->confdata.flags.vdpart) {
+-        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
++        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
+     }
+     if (pd->confdata.flags.umv) {
+-        av_dict_set(pd->ff_opts, "umv", "1", 0);
++        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
+     }
+     if (pd->confdata.flags.aiv) {
+-        av_dict_set(pd->ff_opts, "aiv", "1", 0);
++        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
+     }
++    if (pd->confdata.flags.cbp) {
++    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
++    }
++
++    char buf[1024];
++#define set_dict_opt(val, opt) \
++    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
++    av_dict_set(&(pd->ff_opts), opt, buf, 0)
++
++    set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
++    set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
++    set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
+ }
+ 
+ #undef SET_FLAG
+@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
+         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+         //  { "vrc_init_occupancy",   }, // not yet supported
+         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+-        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+-        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
++        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
++        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
+         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
+         { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+-        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
++        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+     
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+-        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
++        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
+ 
+     pd = self->userdata;
+ 
++    pd->ff_opts = NULL;
++
+     pd->flush_flag = vob->encoder_flush;
+     
+     /* FIXME: move into core? */
+@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
++    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
+     TC_UNLOCK_LIBAVCODEC;
+ 
+     if (ret < 0) {
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
+ static AVFrame             *lavc_convert_frame = NULL;
+ 
+ static AVCodec             *lavc_venc_codec = NULL;
+-static AVDictionary        **lavc_venc_opts = NULL;
++static AVDictionary        *lavc_venc_opts = NULL;
+ static AVFrame             *lavc_venc_frame = NULL;
+ static AVCodecContext      *lavc_venc_context;
+ static avi_t               *avifile = NULL;
+@@ -486,7 +486,7 @@ MOD_init
+ 		            codec->name, codec->fourCC, codec->comments);
+     }
+ 
+-    lavc_venc_context = avcodec_alloc_context();
++    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
+     lavc_venc_frame   = avcodec_alloc_frame();
+ 
+     lavc_convert_frame= avcodec_alloc_frame();
+@@ -838,8 +838,13 @@ MOD_init
+     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
+     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;

transcode-1.1.7-freetype251.patch Added

transcode-1.1.7-libav-10.patch Added

@@ -0,0 +1,260 @@
+--- transcode-1.1.7/export/aud_aux.c.libav	2014-05-12 14:33:00.524424335 +0000
++++ transcode-1.1.7/export/aud_aux.c	2014-05-12 15:22:01.853557714 +0000
+@@ -326,10 +326,10 @@ static int tc_audio_init_ffmpeg(vob_t *v
+ 
+     switch (o_codec) {
+       case   0x50:
+-        codeid = CODEC_ID_MP2;
++        codeid = AV_CODEC_ID_MP2;
+         break;
+       case 0x2000:
+-        codeid = CODEC_ID_AC3;
++        codeid = AV_CODEC_ID_AC3;
+         break;
+       default:
+         tc_warn("cannot init ffmpeg with %x", o_codec);
+@@ -363,7 +363,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+-                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
++                (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3");
+         return(TC_EXPORT_ERROR);
+     }
+ 
+--- transcode-1.1.7/filter/filter_resample.c.libav	2014-05-12 14:32:29.000000000 +0000
++++ transcode-1.1.7/filter/filter_resample.c	2014-05-12 15:26:57.763368255 +0000
+@@ -45,7 +45,7 @@ typedef struct {
+ 
+     int bytes_per_sample;
+ 
+-    ReSampleContext *resample_ctx;
++    AVAudioResampleContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""
+--- transcode-1.1.7/import/decode_lavc.c.libav	2014-05-12 14:33:00.516424069 +0000
++++ transcode-1.1.7/import/decode_lavc.c	2014-05-12 15:32:38.750673288 +0000
+@@ -58,37 +58,37 @@ struct ffmpeg_codec {
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+-  {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+-  {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
+     {"MP42", "DIV2", ""}},
+-  {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
+     {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
+-  {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
+     {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
+-  {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
+     {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
+-  {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
+     {"MPG1", ""}},
+-  {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
+     {"DVSD", ""}},
+-  {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
+     {"WMV1", ""}},
+-  {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
+     {"WMV2", ""}},
+-  {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
+     {"HFYU", ""}},
+-  {CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
+     {"I263", ""}},
+-  {CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
+     {"H263", "U263", "VIV1", ""}},
+-  {CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
+     {"RV10", "RV13", ""}},
+-  {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
+     {"SVQ1", ""}},
+-  {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
+     {"SVQ3", ""}},
+-  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
+     {"MPG2", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
+ 
+--- transcode-1.1.7/import/import_ffmpeg.c.libav	2014-05-12 14:33:00.524424335 +0000
++++ transcode-1.1.7/import/import_ffmpeg.c	2014-05-12 15:31:52.589142857 +0000
+@@ -59,51 +59,51 @@ struct ffmpeg_codec {
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+-  {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+-  {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
+     {"MP42", "DIV2", ""}},
+-  {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
+     {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
+-  {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
+     {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
+-  {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
+     {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
+-  {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
+     {"MPG1", ""}},
+-  {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
+     {"DVSD", ""}},
+-  {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
+     {"WMV1", ""}},
+-  {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
+     {"WMV2", ""}},
+-  {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
+     {"HFYU", ""}},
+-  {CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
+     {"I263", ""}},
+-  {CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
+     {"H263", "U263", "VIV1", ""}},
+-  {CODEC_ID_H264, TC_CODEC_H264, "h264",
++  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
+     {"H264", "h264", "X264", "x264", "avc1", ""}},
+-  {CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
+     {"RV10", "RV13", ""}},
+-  {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
+     {"SVQ1", ""}},
+-  {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
+     {"SVQ3", ""}},
+-  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
+     {"MPG2", ""}},
+-  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
+     {"MPG2", ""}},
+-  {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
++  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
+     {"ASV1", ""}},
+-  {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
++  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
+     {"ASV2", ""}},
+-  {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
++  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
+     {"FFV1", ""}},
+-  {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
+     {"I420", "IYUV", ""}},
+-  {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
+     {"Y42B", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
+ 
+@@ -324,13 +324,13 @@ do_avi:
+     // XXX: some codecs need extra data
+     switch (codec->id)
+     {
+-      case CODEC_ID_MJPEG: extra_data_size  = 28; break;
+-      case CODEC_ID_LJPEG: extra_data_size  = 28; break;
+-      case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
+-      case CODEC_ID_ASV1: extra_data_size = 8; break;
+-      case CODEC_ID_ASV2: extra_data_size = 8; break;
+-      case CODEC_ID_WMV1: extra_data_size = 4; break;
+-      case CODEC_ID_WMV2: extra_data_size = 4; break;
++      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
++      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
++      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
++      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
++      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
++      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
++      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
+       default: extra_data_size = 0; break;
+     }
+ 
+@@ -360,7 +360,7 @@ do_avi:
+         frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
+ 
+ 	// we adapt the color space
+-        if(codec->id == CODEC_ID_MJPEG) {
++        if(codec->id == AV_CODEC_ID_MJPEG) {
+ 	  enable_levels_filter();
+         }
+         break;
+@@ -434,7 +434,7 @@ do_dv:

transcode-1.1.7-libav-9.patch Added

@@ -0,0 +1,31 @@
+--- ./import/probe_ffmpeg.c.original	2013-04-22 20:04:51.058081388 +0200
++++ ./import/probe_ffmpeg.c	2013-04-22 20:05:25.744081897 +0200
+@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
+         return;
+     }
+ 
+-    ret = av_find_stream_info(lavf_dmx_context);
++    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
+     if (ret < 0) {
+         tc_log_error(__FILE__, "unable to fetch informations from '%s'"
+                                " (libavformat failure)",
+--- ./import/decode_lavc.c.original	2013-04-22 20:06:17.260082652 +0200
++++ ./import/decode_lavc.c	2013-04-22 20:07:47.564083975 +0200
+@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
+ 
+   // Set these to the expected values so that ffmpeg's decoder can
+   // properly detect interlaced input.
+-  lavc_dec_context = avcodec_alloc_context();
++  lavc_dec_context = avcodec_alloc_context3(NULL);
+   if (lavc_dec_context == NULL) {
+       tc_log_error(__FILE__, "Could not allocate enough memory.");
+       goto decoder_error;
+@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
+   lavc_dec_context->error_concealment = 3;
+   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+ 
+-  if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
++  if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
+       tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
+ 		   codec->name);
+       goto decoder_error;

transcode-1.1.7-preset-force.patch Added

@@ -0,0 +1,28 @@
+Do not force using a preset. Do not try to open non-existant preset by default.
+
+Index: export/export_ffmpeg.c
+===================================================================
+--- export/export_ffmpeg.c.orig
++++ export/export_ffmpeg.c
+@@ -1199,7 +1199,7 @@ MOD_init
+     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+-	if (lavc_param_video_preset) {
++	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+ 		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+ 
+Index: export/ffmpeg_cfg.c
+===================================================================
+--- export/ffmpeg_cfg.c.orig
++++ export/ffmpeg_cfg.c
+@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
+ //int lavc_param_atag = 0;
+ //int lavc_param_abitrate = 224;
+ 
+-char *lavc_param_video_preset = "medium";
++char *lavc_param_video_preset = "none";
+ char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
+ 
+ TCConfigEntry lavcopts_conf[]={

transcode-1.1.7-preset-free.patch Added

@@ -0,0 +1,35 @@
+Fix invalid free when preset file not found
+https://bugs.gentoo.org/show_bug.cgi?id=322945
+Author: Brennan Shacklett
+
+Index: export/export_ffmpeg.c
+===================================================================
+--- export/export_ffmpeg.c.orig
++++ export/export_ffmpeg.c
+@@ -322,7 +322,7 @@ static int opt_preset(const char *opt, c
+     }
+ 
+     if(!f){
+-        fprintf(stderr, "File for preset '%s' not found\n", arg);
++        tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
+         av_exit(1);
+     }
+ 
+@@ -1201,7 +1201,7 @@ MOD_init
+ 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ 	if (lavc_param_video_preset) {
+ 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
+-		video_codec_name = ffmpeg_codec_name(codec->name);
++		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
+ 
+ 		const char *preset_start = lavc_param_video_preset;
+ 		while (preset_start) {
+@@ -1219,6 +1219,8 @@ MOD_init
+ 			if (opt_preset("vpre", preset_name) != 0) {
+ 				tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
+ 			}
++      av_free(video_codec_name);
++      video_codec_name = NULL;
+ 			if (verbose) {
+ 				int i;
+ 				tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count);

transcode-cflags.patch Deleted

@@ -1,83 +0,0 @@
----
- configure.in         |    4 ++++
- import/Makefile.am   |   16 ++++++++--------
- libtcext/Makefile.am |    1 +
- 3 files changed, 13 insertions(+), 8 deletions(-)
-
-Index: transcode-1.2.0/configure.in
-===================================================================
---- transcode-1.2.0.orig/configure.in
-+++ transcode-1.2.0/configure.in
-@@ -687,6 +687,10 @@ else
-   AC_SUBST(LIBAVFORMAT_LIBS)
- 
-   AC_DEFINE([HAVE_FFMPEG], 1, [Have FFmpeg libraries support])
-+  TC_PKG_CHECK(libavutil, optional, LIBAVUTIL, no, none,
-+   none, '', libavutil, [http://www.ffmpeg.org/])
-+  AC_SUBST(LIBAVUTIL_CFLAGS)
-+  AC_SUBST(LIBAVUTIL_LIBS)
- 
- fi
- AM_CONDITIONAL(HAVE_FFMPEG, test x"$enable_ffmpeg" = x"yes")
-Index: transcode-1.2.0/import/Makefile.am
-===================================================================
---- transcode-1.2.0.orig/import/Makefile.am
-+++ transcode-1.2.0/import/Makefile.am
-@@ -338,6 +338,10 @@ tcdecode@TC_VERSUFFIX@_SOURCES = \
- 	decode_yuv.c
- 
- tcdecode@TC_VERSUFFIX@_LDADD = \
-+	$(LIBTCVIDEO_LIBS) \
-+	$(LIBTCEXT_LIBS) \
-+	$(LIBTCUTIL_LIBS) \
-+	$(LIBTC_LIBS) \
- 	$(GRAPHICSMAGICK_LIBS) \
- 	$(LIBAVCODEC_LIBS) \
- 	$(LIBDV_LIBS) \
-@@ -352,11 +356,7 @@ tcdecode@TC_VERSUFFIX@_LDADD = \
- 	$(VORBISFILE) \
- 	$(XIO_LIBS) \
- 	$(DLDARWIN_LIBS) \
--	$(LIBTCVIDEO_LIBS) \
- 	$(ACLIB_LIBS) \
--	$(LIBTC_LIBS) \
--	$(LIBTCEXT_LIBS) \
--	$(LIBTCUTIL_LIBS) \
- 	$(PTHREAD_LIBS)
- 
- tcdecode@TC_VERSUFFIX@_CFLAGS = $(AM_CFLAGS) \
-@@ -490,6 +490,10 @@ tcprobe@TC_VERSUFFIX@_SOURCES = \
- 	probe_pvn.c
- 
- tcprobe@TC_VERSUFFIX@_LDADD = \
-+	$(LIBTCVIDEO_LIBS) \
-+	$(LIBTC_LIBS) \
-+	$(LIBTCEXT_LIBS) \
-+	$(LIBTCUTIL_LIBS) \
- 	$(LIBAVFORMAT_LIBS) \
- 	$(LIBAVCODEC_LIBS) \
- 	$(AVILIB_LIBS) \
-@@ -508,11 +512,7 @@ tcprobe@TC_VERSUFFIX@_LDADD = \
- 	$(BSDAV_LIBS) \
- 	$(X11SOURCE_LIBS) \
- 	$(DLDARWIN_LIBS) \
--	$(LIBTCVIDEO_LIBS) \
- 	$(ACLIB_LIBS) \
--	$(LIBTC_LIBS) \
--	$(LIBTCEXT_LIBS) \
--	$(LIBTCUTIL_LIBS) \
- 	$(PTHREAD_LIBS) \
- 	-lm
- 
-Index: transcode-1.2.0/libtcext/Makefile.am
-===================================================================
---- transcode-1.2.0.orig/libtcext/Makefile.am
-+++ transcode-1.2.0/libtcext/Makefile.am
-@@ -2,6 +2,7 @@
- 
- AM_CPPFLAGS = \
- 	$(PTHREAD_CFLAGS) \
-+	$(LIBAVUTIL_CFLAGS) \
- 	$(GRAPHICSMAGICK_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/src \

transcode-export_ffmpeg.patch Added

@@ -0,0 +1,43 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ transcode (3:1.1.7-8) unstable; urgency=medium
+ .
+   * Team upload.
+   * debian/patches:
+     - 10_freetype.patch: Fix compilation with recent versions of
+       freetype. (Closes: #732142)
+     - 11_underlinkage.patch: Fix underlinkage of some plugins.
+Author: Sebastian Ramacher <sramacher@debian.org>
+Bug-Debian: http://bugs.debian.org/732142
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: export/export_ffmpeg.c
+===================================================================
+--- export/export_ffmpeg.c.orig
++++ export/export_ffmpeg.c
+@@ -851,7 +851,7 @@ MOD_init
+     lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
+     lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
+     lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
+-    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
++    lavc_venc_context->rc_eq              = av_strdup(lavc_param_rc_eq);
+     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
+     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
+     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;

transcode-fix-64bit-portability.patch Added

@@ -0,0 +1,36 @@
+Index: export/export_ffmpeg.c
+===================================================================
+--- export/export_ffmpeg.c.orig
++++ export/export_ffmpeg.c
+@@ -181,10 +181,11 @@ static char *tc_strchrnul(const char *s,
+ 
+ 
+ /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
+-#include <libavutil/opt.h>
+-#include <libavutil/avstring.h>
+-#include <libswscale/swscale.h>
+-
++#include <ffmpeg/libavutil/opt.h>
++#include <ffmpeg/libavutil/avstring.h>
++#include <ffmpeg/libswscale/swscale.h>
++#include <ffmpeg/libavcodec/avcodec.h>
++#include <ffmpeg/libavutil/eval.h>
+ /* GLUE: */
+ #define FFMPEG_DATADIR lavc_param_ffmpeg_datadir
+ 
+@@ -245,12 +246,13 @@ int opt_default(const char *opt, const c
+     int type;
+     int ret= 0;
+     const AVOption *o= NULL;
+-    int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0};
++    const AVOption * 	av_find_opt (void *v, const char *name, const char *unit, int mask, int flags);
++    long opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0};
+ 
+     for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
+ 		/* GLUE: +if */
+ 		if (type == AVMEDIA_TYPE_VIDEO) {
+-        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
++        AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
+         if(o2)
+             ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
+ 		/* GLUE: +if */

export_dvraw.c Added

@@ -0,0 +1,396 @@
+/*
+ *  export_dvraw.c
+ *
+ *  Copyright (C) Thomas Östreich - June 2001
+ *
+ *  This file is part of transcode, a video stream processing tool
+ *      
+ *  transcode is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  transcode is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU General Public License
+ *  along with GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <libdv/dv.h>
+#include "transcode.h"
+#include "vid_aux.h"
+#include "optstr.h"
+#include "ioaux.h"
+
+#define MOD_NAME    "export_dvraw.so"
+#define MOD_VERSION "v0.4a3 (2006-02-01)"
+#define MOD_CODEC   "(video) Digital Video | (audio) PCM"
+
+static int verbose_flag=TC_QUIET;
+static int capability_flag=TC_CAP_PCM|TC_CAP_RGB|TC_CAP_YUV|TC_CAP_VID|TC_CAP_YUV422;
+
+#define MOD_PRE dvraw
+#include "export_def.h"
+
+static int fd;
+
+static int16_t *audio_bufs[4];
+
+static uint8_t *target = NULL;
+
+static dv_encoder_t *encoder = NULL;
+static uint8_t *pixels[3], *tmp_buf;
+
+static int frame_size=0, format=0;
+static int pass_through=0;
+
+static int chans, rate;
+static int dv_yuy2_mode=0;
+static int dv_uyvy_mode=0;
+
+static int media_type = 0;
+
+/* Allocate a buffer aligned to the machine's page size, if known.  The
+ * buffer must be freed with buffree() (not free()). */
+
+void *_tc_bufalloc(const char *file, int line, size_t size)
+{
+#ifdef HAVE_GETPAGESIZE
+    unsigned long pagesize = getpagesize();
+    int8_t *base = malloc(size + sizeof(void *) + pagesize);
+    int8_t *ptr = NULL;
+    unsigned long offset = 0;
+
+    if (base == NULL) {
+        fprintf(stderr, "[%s:%d] tc_bufalloc(): can't allocate %lu bytes\n",
+                        file, line, (unsigned long)size);
+    } else {
+        ptr = base + sizeof(void *);
+        offset = (unsigned long)ptr % pagesize;
+
+        if (offset)
+            ptr += (pagesize - offset);
+        ((void **)ptr)[-1] = base;  /* save the base pointer for freeing */
+    }
+    return ptr;
+#else  /* !HAVE_GETPAGESIZE */
+    return malloc(size);
+#endif
+}
+
+/* Free a buffer allocated with tc_bufalloc(). */
+void tc_buffree(void *ptr)
+{
+#ifdef HAVE_GETPAGESIZE
+    if (ptr)
+	free(((void **)ptr)[-1]);
+#else
+    free(ptr);
+#endif
+}
+
+#define tc_bufalloc(size) \
+    _tc_bufalloc(__FILE__, __LINE__, size)
+
+
+/* ------------------------------------------------------------ 
+ *
+ * init codec
+ *
+ * ------------------------------------------------------------*/
+
+MOD_init
+{
+    int i;
+    if (param->flag == TC_VIDEO) {
+    	int want_tmp_buf = 0;
+        target = tc_bufalloc(TC_FRAME_DV_PAL);
+
+        if (vob->dv_yuy2_mode) {
+            tmp_buf = tc_bufalloc(PAL_W*PAL_H*2); //max frame
+            dv_yuy2_mode = 1;
+	        want_tmp_buf = 1;
+        }
+        if (vob->im_v_codec == CODEC_YUV422) {
+            tmp_buf = tc_bufalloc(PAL_W*PAL_H*2); //max frame
+            dv_uyvy_mode = 1;
+	        want_tmp_buf = 1;
+        }
+        if (!target || (want_tmp_buf && !tmp_buf)) {
+            fprintf(stderr, "[%s] can't allocate video buffers\n", MOD_NAME);
+            return(TC_EXPORT_ERROR); 
+        }
+        
+        encoder = dv_encoder_new(FALSE, FALSE, FALSE);
+        if (!encoder) {
+            fprintf(stderr, "[%s] can't allocate video encoder\n", MOD_NAME);
+            return(TC_EXPORT_ERROR); 
+        }
+   
+        media_type |= TC_VIDEO;
+        return(TC_EXPORT_OK);
+    }
+  
+    if (param->flag == TC_AUDIO) {
+        if (!(media_type & TC_VIDEO)) {
+            return(TC_EXPORT_ERROR);
+        }
+        // tmp audio buffer
+        for (i = 0; i < 4; i++) {
+            audio_bufs[i] = malloc(DV_AUDIO_MAX_SAMPLES * sizeof(int16_t));
+            if (!(audio_bufs[i])) {
+                fprintf(stderr, "[%s] can't allocate audio buffers\n", MOD_NAME);
+                return(TC_EXPORT_ERROR); 
+            }  
+        }     
+    
+        media_type |= TC_AUDIO;
+        return(TC_EXPORT_OK);
+    }
+  
+    // invalid flag
+    return(TC_EXPORT_ERROR); 
+}
+
+/* ------------------------------------------------------------ 
+ *
+ * open outputfile
+ *
+ * ------------------------------------------------------------*/
+
+MOD_open
+{
+    if (param->flag == TC_VIDEO) {
+        // video
+        if ((fd = open(vob->video_out_file, O_RDWR|O_CREAT|O_TRUNC,
+                       S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))<0) {
+            perror("open file");
+            return(TC_EXPORT_ERROR);
+        }     
+    
+        switch (vob->im_v_codec) {
+          case CODEC_RGB:
+            format = 0;
+            if (verbose & TC_DEBUG) {
+                fprintf(stderr, "[%s] raw format is RGB\n", MOD_NAME);
+            }
+            break;
+          case CODEC_YUV:
+            format = 1;
+            if (verbose & TC_DEBUG) {
+                fprintf(stderr, "[%s] raw format is YV12\n", MOD_NAME);
+            }
+            break;
+          case CODEC_YUV422:
+            format = 1;
+            if (verbose & TC_DEBUG) {
+                fprintf(stderr, "[%s] raw format is UYVY\n", MOD_NAME);
+            }
+            break;
+          case CODEC_RAW: /* fallthrough */
+          case CODEC_RAW_YUV:
+            format = 1;

transcode-1.2.0.tar.bz2 -> transcode-1.1.7.tar.bz2 Changed