Use system x265 (patch from Gentoo). Use system libvpx (patch from FreeBSD). Use system ffmpeg (patch from upstream). Add fdk_acc build option (off). Close #3987.
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From d5bdc7e2590faa0a397d13730491761410ca24fb Mon Sep 17 00:00:00 2001
|
|
From: Sean McGovern <gseanmcg@gmail.com>
|
|
Date: Wed, 11 Nov 2015 17:26:49 -0500
|
|
Subject: [PATCH] muxavformat: check for presence of AV_PKT_DATA_FALLBACK_TRACK
|
|
|
|
---
|
|
libhmuxavformat.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git libhb/muxavformat.c libhb/muxavformat.c
|
|
index aac09b7..7879d70 100644
|
|
--- libhb/muxavformat.c
|
|
+++ libhb/muxavformat.c
|
|
@@ -121,7 +121,10 @@ static int avformatInit( hb_mux_object_t * m )
|
|
hb_mux_data_t * track;
|
|
int meta_mux;
|
|
int max_tracks;
|
|
- int ii, jj, ret;
|
|
+ int ii, ret;
|
|
+#ifdef AV_PKT_DATA_FALLBACK_TRACK
|
|
+ int jj;
|
|
+#endif
|
|
|
|
int clock_min, clock_max, clock;
|
|
hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
|
|
@@ -593,6 +596,7 @@ static int avformatInit( hb_mux_object_t * m )
|
|
}
|
|
}
|
|
|
|
+#ifdef AV_PKT_DATA_FALLBACK_TRACK
|
|
// Check for audio track associations
|
|
for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
|
|
{
|
|
@@ -642,6 +646,7 @@ static int avformatInit( hb_mux_object_t * m )
|
|
} break;
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
char * subidx_fmt =
|
|
"size: %dx%d\n"
|