mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
126 lines
4.0 KiB
C
126 lines
4.0 KiB
C
$NetBSD: patch-export_export_ffmpeg.c,v 1.1 2012/11/17 21:46:44 markd Exp $
|
|
|
|
Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
|
|
|
|
--- export/export_ffmpeg.c.orig 2011-11-19 16:50:27.000000000 +0000
|
|
+++ 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;
|
|
- ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
|
|
+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
|
|
TC_UNLOCK_LIBAVCODEC;
|
|
if (ret < 0) {
|
|
tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
|
|
return TC_EXPORT_ERROR;
|
|
}
|
|
|
|
- if (lavc_venc_context->codec->encode == NULL) {
|
|
+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
|
|
tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
|
|
- "(lavc_venc_context->codec->encode == NULL)");
|
|
+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
|
|
return TC_EXPORT_ERROR;
|
|
}
|
|
|