forked from ports/contrib
transcode: 1.1.5 -> 1.1.7
This commit is contained in:
Danny Rawlins
parent
9d8566e60a
commit
8918f23f10
@ -172,8 +172,6 @@ lrwxrwxrwx root/root usr/lib/transcode/export_xvid.so -> export_xvid4.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_testframe.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_text.la
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_text.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_tomsmocomp.la
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_tomsmocomp.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_transform.la
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_transform.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/filter_unsharp.la
|
||||
@ -226,8 +224,6 @@ lrwxrwxrwx root/root usr/lib/transcode/export_xvid.so -> export_xvid4.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_pvn.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_raw.la
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_raw.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_v4l.la
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_v4l.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_v4l2.la
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_v4l2.so
|
||||
-rwxr-xr-x root/root usr/lib/transcode/import_vag.la
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
f9294eccd7f0db849f153cef595c416a ffmpeg.patch
|
||||
c0bd49a88f667c68c4430ad25bbed510 subtitleripper-0.3-4.tgz
|
||||
41ac6b1c0fe30f3aab286e771fc31b9e transcode-1.1.5.tar.bz2
|
||||
9bb25a796a8591fb764de46ee87ce505 transcode-1.1.7.tar.bz2
|
||||
|
||||
@ -1,19 +1,22 @@
|
||||
# Description: Command line utilities for transcoding various media formats.
|
||||
# URL: http://www.transcoding.org/cgi-bin/transcode
|
||||
# URL: http://tcforge.berlios.de/
|
||||
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
|
||||
# Packager: Martin Opel, mo at obbl-net dot de
|
||||
# Depends on: imagemagick liba52 libdvdread libmpeg2 lzo mjpegtools
|
||||
|
||||
name=transcode
|
||||
version=1.1.5
|
||||
version=1.1.7
|
||||
release=1
|
||||
source=(http://www.hvlinux.net/crux/distfiles/$name/$name-$version.tar.bz2
|
||||
http://downloads.sourceforge.net/project/subtitleripper/subtitleripper/subtitleripper-0.3-4/subtitleripper-0.3-4.tgz)
|
||||
source=(https://bitbucket.org/france/transcode-tcforge/downloads/$name-$version.tar.bz2
|
||||
http://downloads.sourceforge.net/project/subtitleripper/subtitleripper/subtitleripper-0.3-4/subtitleripper-0.3-4.tgz
|
||||
ffmpeg.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
CFLAGS+=' -pthread'
|
||||
|
||||
patch -p 1 -i $SRC/ffmpeg.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
@ -37,7 +40,8 @@ build() {
|
||||
--enable-xvid \
|
||||
--enable-x264 \
|
||||
--enable-faac \
|
||||
--enable-libxml2
|
||||
--enable-libxml2 \
|
||||
--enable-netstream
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
139
transcode/ffmpeg.patch
Normal file
139
transcode/ffmpeg.patch
Normal file
@ -0,0 +1,139 @@
|
||||
diff -pruN transcode-1.1.7.orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
|
||||
--- transcode-1.1.7.orig/export/export_ffmpeg.c 2013-02-14 05:28:00.402781541 +0000
|
||||
+++ transcode-1.1.7/export/export_ffmpeg.c 2013-02-14 05:30:30.956777199 +0000
|
||||
@@ -180,7 +180,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 +470,6 @@ MOD_init
|
||||
}
|
||||
|
||||
TC_LOCK_LIBAVCODEC;
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
TC_UNLOCK_LIBAVCODEC;
|
||||
|
||||
@@ -634,7 +633,6 @@ 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;
|
||||
|
||||
break;
|
||||
|
||||
@@ -674,7 +672,6 @@ MOD_init
|
||||
|
||||
lavc_param_rc_buffer_size = 224 * 8;
|
||||
lavc_param_rc_buffer_aggressivity = 99;
|
||||
- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
|
||||
|
||||
break;
|
||||
|
||||
@@ -1252,7 +1249,7 @@ MOD_init
|
||||
return TC_EXPORT_ERROR;
|
||||
}
|
||||
|
||||
- if (lavc_venc_context->codec->encode == NULL) {
|
||||
+ if (lavc_venc_context->codec->encode2 == NULL) {
|
||||
tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
|
||||
"(lavc_venc_context->codec->encode == NULL)");
|
||||
return TC_EXPORT_ERROR;
|
||||
diff -pruN transcode-1.1.7.orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
|
||||
--- transcode-1.1.7.orig/export/ffmpeg_cfg.c 2013-02-14 05:28:00.402781541 +0000
|
||||
+++ transcode-1.1.7/export/ffmpeg_cfg.c 2013-02-14 05:30:30.957777199 +0000
|
||||
@@ -160,9 +160,7 @@ TCConfigEntry lavcopts_conf[]={
|
||||
{"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
|
||||
{"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
|
||||
{"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
|
||||
- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
|
||||
// {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
|
||||
- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
|
||||
{"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
|
||||
{"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
|
||||
{"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
|
||||
@@ -211,7 +209,6 @@ TCConfigEntry lavcopts_conf[]={
|
||||
#else
|
||||
{"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
|
||||
#endif
|
||||
- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
|
||||
{"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
|
||||
{"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
|
||||
{"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
|
||||
@@ -223,9 +220,6 @@ TCConfigEntry lavcopts_conf[]={
|
||||
{"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
|
||||
{"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
|
||||
{"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
|
||||
- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
|
||||
- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
|
||||
- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
|
||||
{"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
|
||||
{"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
|
||||
{"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
|
||||
diff -pruN transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
|
||||
--- transcode-1.1.7.orig/filter/filter_pp.c 2013-02-14 05:28:00.403781541 +0000
|
||||
+++ transcode-1.1.7/filter/filter_pp.c 2013-02-14 05:30:30.958777199 +0000
|
||||
@@ -38,8 +38,8 @@
|
||||
|
||||
/* FIXME: these use the filter ID as an index--the ID can grow
|
||||
* arbitrarily large, so this needs to be fixed */
|
||||
-static pp_mode_t *mode[100];
|
||||
-static pp_context_t *context[100];
|
||||
+static pp_mode *mode[100];
|
||||
+static pp_context *context[100];
|
||||
static int width[100], height[100];
|
||||
static int pre[100];
|
||||
|
||||
diff -pruN transcode-1.1.7.orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c
|
||||
--- transcode-1.1.7.orig/import/decode_lavc.c 2013-02-14 05:28:00.390781542 +0000
|
||||
+++ transcode-1.1.7/import/decode_lavc.c 2013-02-14 05:30:30.958777199 +0000
|
||||
@@ -181,7 +181,7 @@ void decode_lavc(decode_t *decode)
|
||||
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
|
||||
lavc_dec_context->error_resilience = 2;
|
||||
#else
|
||||
- lavc_dec_context->error_recognition = 2;
|
||||
+ lavc_dec_context->err_recognition = 2;
|
||||
#endif
|
||||
lavc_dec_context->error_concealment = 3;
|
||||
lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
|
||||
diff -pruN transcode-1.1.7.orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c
|
||||
--- transcode-1.1.7.orig/import/import_ffmpeg.c 2013-02-14 05:28:00.388781542 +0000
|
||||
+++ transcode-1.1.7/import/import_ffmpeg.c 2013-02-14 05:30:30.959777199 +0000
|
||||
@@ -314,7 +314,7 @@ do_avi:
|
||||
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
|
||||
lavc_dec_context->error_resilience = 2;
|
||||
#else
|
||||
- lavc_dec_context->error_recognition = 2;
|
||||
+ lavc_dec_context->err_recognition = 2;
|
||||
#endif
|
||||
lavc_dec_context->error_concealment = 3;
|
||||
lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
|
||||
diff -pruN transcode-1.1.7.orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c
|
||||
--- transcode-1.1.7.orig/import/probe_ffmpeg.c 2013-02-14 05:28:00.388781542 +0000
|
||||
+++ transcode-1.1.7/import/probe_ffmpeg.c 2013-02-14 05:30:30.959777199 +0000
|
||||
@@ -99,8 +99,8 @@ void probe_ffmpeg(info_t *ipipe)
|
||||
|
||||
TC_INIT_LIBAVCODEC;
|
||||
|
||||
- ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
|
||||
- NULL, 0, NULL);
|
||||
+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
|
||||
+ NULL, NULL);
|
||||
if (ret != 0) {
|
||||
tc_log_error(__FILE__, "unable to open '%s'"
|
||||
" (libavformat failure)",
|
||||
diff -pruN transcode-1.1.7.orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h
|
||||
--- transcode-1.1.7.orig/libtc/tcavcodec.h 2013-02-14 05:28:00.396781541 +0000
|
||||
+++ transcode-1.1.7/libtc/tcavcodec.h 2013-02-14 05:30:30.959777199 +0000
|
||||
@@ -53,7 +53,6 @@ extern pthread_mutex_t tc_libavcodec_mut
|
||||
|
||||
#define TC_INIT_LIBAVCODEC do { \
|
||||
TC_LOCK_LIBAVCODEC; \
|
||||
- avcodec_init(); \
|
||||
avcodec_register_all(); \
|
||||
TC_UNLOCK_LIBAVCODEC; \
|
||||
} while (0)
|
||||
Loading…
x
Reference in New Issue
Block a user