* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/
@ 2019-03-04 3:14 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-03-04 3:14 UTC (permalink / raw
To: gentoo-commits
commit: b1f81c470cb6e81ded3f8acc6a21fbd913678e73
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Mar 2 11:58:15 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 03:11:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f81c47
media-video/handbrake: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11212
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../handbrake/files/handbrake-0.10.3-nolibav.patch | 76 ----------------------
1 file changed, 76 deletions(-)
diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
deleted file mode 100644
index 8539186aaa5..00000000000
--- a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Tue, 3 Nov 2015 10:16:01 -0800
-Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling
-
----
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
-index 0d70597..373c2ab 100644
---- a/libhb/muxavformat.c
-+++ b/libhb/muxavformat.c
-@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )
- hb_mux_data_t * track;
- int meta_mux;
- int max_tracks;
-- int ii, ret;
-+ int ii, jj, ret;
-
- int clock_min, clock_max, clock;
- hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
-@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )
- }
- }
-
-+ // Check for audio track associations
-+ for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
-+ {
-+ audio = hb_list_item(job->list_audio, ii);
-+ switch (audio->config.out.codec & HB_ACODEC_MASK)
-+ {
-+ case HB_ACODEC_FFAAC:
-+ case HB_ACODEC_CA_AAC:
-+ case HB_ACODEC_CA_HAAC:
-+ case HB_ACODEC_FDK_AAC:
-+ case HB_ACODEC_FDK_HAAC:
-+ break;
-+
-+ default:
-+ {
-+ // Mark associated fallback audio tracks for any non-aac track
-+ for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
-+ {
-+ hb_audio_t * fallback;
-+ int codec;
-+
-+ if (ii == jj) continue;
-+
-+ fallback = hb_list_item( job->list_audio, jj );
-+ codec = fallback->config.out.codec & HB_ACODEC_MASK;
-+ if (fallback->config.in.track == audio->config.in.track &&
-+ (codec == HB_ACODEC_FFAAC ||
-+ codec == HB_ACODEC_CA_AAC ||
-+ codec == HB_ACODEC_CA_HAAC ||
-+ codec == HB_ACODEC_FDK_AAC ||
-+ codec == HB_ACODEC_FDK_HAAC))
-+ {
-+ hb_mux_data_t * fallback_track;
-+ int * sd;
-+
-+ track = audio->priv.mux_data;
-+ fallback_track = fallback->priv.mux_data;
-+ sd = (int*)av_stream_new_side_data(track->st,
-+ AV_PKT_DATA_FALLBACK_TRACK,
-+ sizeof(int));
-+ if (sd != NULL)
-+ {
-+ *sd = fallback_track->st->index;
-+ }
-+ }
-+ }
-+ } break;
-+ }
-+ }
-+
- char * subidx_fmt =
- "size: %dx%d\n"
- "org: %d, %d\n"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/
@ 2021-07-13 21:16 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-07-13 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 90df404c0b5d87b409245a35464e0e708479e73e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 12 18:14:32 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 21:14:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90df404c
media-video/handbrake: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/21615
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
media-video/handbrake/files/handbrake-1.3.2-x265-link.patch | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
deleted file mode 100644
index 589a204cc19..00000000000
--- a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/test/module.defs b/test/module.defs
---- a/test/module.defs 2020-05-23 17:23:21.912103481 +0200
-+++ b/test/module.defs 2020-05-23 17:23:36.106103799 +0200
-@@ -16,7 +16,7 @@
- TEST.GCC.l = \
- ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
- dvdread fribidi \
-- swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-+ swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
- bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
-
- ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/
@ 2022-02-09 23:06 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-02-09 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 0e71cefa9cdbb19d722c823448df7b9e186164b8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 7 06:25:19 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb 9 23:01:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e71cefa
media-video/handbrake: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/24104
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...audio-encoders-when-linking-to-FFmpeg-4.4.patch | 28 --------
.../handbrake-1.3.3-remove-faac-dependency.patch | 84 ----------------------
2 files changed, 112 deletions(-)
diff --git a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
deleted file mode 100644
index d7cc565377fd..000000000000
--- a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
-From: Damiano Galassi <damiog@gmail.com>
-Date: Sat, 10 Apr 2021 13:18:02 +0200
-Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4.
-
----
- libhb/encavcodecaudio.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
-index 52fc4565d..e6cf42414 100644
---- a/libhb/encavcodecaudio.c
-+++ b/libhb/encavcodecaudio.c
-@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list)
-
- // Prepare input frame
- int out_size;
-- AVFrame frame = { .nb_samples = pv->samples_per_frame, };
-+ AVFrame frame = { .nb_samples = pv->samples_per_frame,
-+ .format = pv->context->sample_fmt,
-+ .channels = pv->context->channels
-+ };
-
- out_size = av_samples_get_buffer_size(NULL,
- pv->context->channels,
---
-2.26.3
-
diff --git a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
deleted file mode 100644
index 7e8ab99730a8..000000000000
--- a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/libhb/common.c
-+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
- {
- // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, },
-- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
- { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
---- a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-09 23:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-13 21:16 [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-02-09 23:06 Conrad Kostecki
2019-03-04 3:14 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox