Author: krejzi
Date: 2012-12-31 14:49:13 -0700 (Mon, 31 Dec 2012)
New Revision: 2570
Modified:
trunk/transcode/transcode-1.1.7-ffmpeg-2.patch
Log:
Fix previously added patch.
Modified: trunk/transcode/transcode-1.1.7-ffmpeg-2.patch
===================================================================
--- trunk/transcode/transcode-1.1.7-ffmpeg-2.patch 2012-12-31 21:38:49 UTC
(rev 2569)
+++ trunk/transcode/transcode-1.1.7-ffmpeg-2.patch 2012-12-31 21:49:13 UTC
(rev 2570)
@@ -5,8 +5,19 @@
Origin: Archlinux
Description: Fixes building against FFMpeg 1.0
+--- transcode.orig/encode/encode_lavc.c 2011-11-19 17:50:27.000000000
+0100
++++ transcode/encode/encode_lavc.c 2012-12-31 22:44:11.141652409 +0100
+@@ -1387,7 +1387,7 @@
+ 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) {
--- transcode.orig/export/export_ffmpeg.c 2011-11-19 17:50:27.000000000
+0100
-+++ transcode/export/export_ffmpeg.c 2012-12-31 22:32:19.587594898 +0100
++++ transcode/export/export_ffmpeg.c 2012-12-31 22:43:27.901967236 +0100
@@ -180,7 +180,7 @@
@@ -40,6 +51,15 @@
break;
+@@ -887,7 +884,7 @@
+ 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;
@@ -1252,7 +1249,7 @@
return TC_EXPORT_ERROR;
}
@@ -50,7 +70,7 @@
"(lavc_venc_context->codec->encode == NULL)");
return TC_EXPORT_ERROR;
--- transcode.orig/export/ffmpeg_cfg.c 2011-11-19 17:50:27.000000000 +0100
-+++ transcode/export/ffmpeg_cfg.c 2012-12-31 22:33:56.784062423 +0100
++++ transcode/export/ffmpeg_cfg.c 2012-12-31 22:37:31.197314927 +0100
@@ -160,9 +160,7 @@
{"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},
@@ -80,7 +100,7 @@
{"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},
--- transcode.orig/filter/filter_pp.c 2011-11-19 17:50:27.000000000 +0100
-+++ transcode/filter/filter_pp.c 2012-12-31 22:32:19.585594868 +0100
++++ transcode/filter/filter_pp.c 2012-12-31 22:37:31.197314927 +0100
@@ -38,8 +38,8 @@
/* FIXME: these use the filter ID as an index--the ID can grow
@@ -93,7 +113,7 @@
static int pre[100];
--- transcode.orig/import/decode_lavc.c 2011-11-19 17:50:27.000000000
+0100
-+++ transcode/import/decode_lavc.c 2012-12-31 22:32:19.586594883 +0100
++++ transcode/import/decode_lavc.c 2012-12-31 22:37:31.198314943 +0100
@@ -181,7 +181,7 @@
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_dec_context->error_resilience = 2;
@@ -104,7 +124,7 @@
lavc_dec_context->error_concealment = 3;
lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
--- transcode.orig/import/import_ffmpeg.c 2011-11-19 17:50:27.000000000
+0100
-+++ transcode/import/import_ffmpeg.c 2012-12-31 22:32:19.586594883 +0100
++++ transcode/import/import_ffmpeg.c 2012-12-31 22:37:31.199314958 +0100
@@ -314,7 +314,7 @@
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
lavc_dec_context->error_resilience = 2;
@@ -115,7 +135,7 @@
lavc_dec_context->error_concealment = 3;
lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
--- transcode.orig/import/probe_ffmpeg.c 2011-11-19 17:50:27.000000000
+0100
-+++ transcode/import/probe_ffmpeg.c 2012-12-31 22:32:19.586594883 +0100
++++ transcode/import/probe_ffmpeg.c 2012-12-31 22:37:31.199314958 +0100
@@ -99,8 +99,8 @@
TC_INIT_LIBAVCODEC;
@@ -128,7 +148,7 @@
tc_log_error(__FILE__, "unable to open '%s'"
" (libavformat failure)",
--- transcode.orig/libtc/tcavcodec.h 2011-11-19 17:50:27.000000000 +0100
-+++ transcode/libtc/tcavcodec.h 2012-12-31 22:32:19.586594883 +0100
++++ transcode/libtc/tcavcodec.h 2012-12-31 22:37:31.200314974 +0100
@@ -53,7 +53,6 @@
#define TC_INIT_LIBAVCODEC do { \
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
