| 1 |
commit: b1f81c470cb6e81ded3f8acc6a21fbd913678e73 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Mar 2 11:58:15 2019 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 4 03:11:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f81c47 |
| 7 |
|
| 8 |
media-video/handbrake: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/11212 |
| 12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 13 |
|
| 14 |
.../handbrake/files/handbrake-0.10.3-nolibav.patch | 76 ---------------------- |
| 15 |
1 file changed, 76 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 8539186aaa5..00000000000 |
| 20 |
--- a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,76 +0,0 @@ |
| 23 |
-From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: John Stebbins <jstebbins.hb@×××××.com> |
| 25 |
-Date: Tue, 3 Nov 2015 10:16:01 -0800 |
| 26 |
-Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling |
| 27 |
- |
| 28 |
---- |
| 29 |
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c |
| 30 |
-index 0d70597..373c2ab 100644 |
| 31 |
---- a/libhb/muxavformat.c |
| 32 |
-+++ b/libhb/muxavformat.c |
| 33 |
-@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m ) |
| 34 |
- hb_mux_data_t * track; |
| 35 |
- int meta_mux; |
| 36 |
- int max_tracks; |
| 37 |
-- int ii, ret; |
| 38 |
-+ int ii, jj, ret; |
| 39 |
- |
| 40 |
- int clock_min, clock_max, clock; |
| 41 |
- hb_video_framerate_get_limits(&clock_min, &clock_max, &clock); |
| 42 |
-@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m ) |
| 43 |
- } |
| 44 |
- } |
| 45 |
- |
| 46 |
-+ // Check for audio track associations |
| 47 |
-+ for (ii = 0; ii < hb_list_count(job->list_audio); ii++) |
| 48 |
-+ { |
| 49 |
-+ audio = hb_list_item(job->list_audio, ii); |
| 50 |
-+ switch (audio->config.out.codec & HB_ACODEC_MASK) |
| 51 |
-+ { |
| 52 |
-+ case HB_ACODEC_FFAAC: |
| 53 |
-+ case HB_ACODEC_CA_AAC: |
| 54 |
-+ case HB_ACODEC_CA_HAAC: |
| 55 |
-+ case HB_ACODEC_FDK_AAC: |
| 56 |
-+ case HB_ACODEC_FDK_HAAC: |
| 57 |
-+ break; |
| 58 |
-+ |
| 59 |
-+ default: |
| 60 |
-+ { |
| 61 |
-+ // Mark associated fallback audio tracks for any non-aac track |
| 62 |
-+ for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ ) |
| 63 |
-+ { |
| 64 |
-+ hb_audio_t * fallback; |
| 65 |
-+ int codec; |
| 66 |
-+ |
| 67 |
-+ if (ii == jj) continue; |
| 68 |
-+ |
| 69 |
-+ fallback = hb_list_item( job->list_audio, jj ); |
| 70 |
-+ codec = fallback->config.out.codec & HB_ACODEC_MASK; |
| 71 |
-+ if (fallback->config.in.track == audio->config.in.track && |
| 72 |
-+ (codec == HB_ACODEC_FFAAC || |
| 73 |
-+ codec == HB_ACODEC_CA_AAC || |
| 74 |
-+ codec == HB_ACODEC_CA_HAAC || |
| 75 |
-+ codec == HB_ACODEC_FDK_AAC || |
| 76 |
-+ codec == HB_ACODEC_FDK_HAAC)) |
| 77 |
-+ { |
| 78 |
-+ hb_mux_data_t * fallback_track; |
| 79 |
-+ int * sd; |
| 80 |
-+ |
| 81 |
-+ track = audio->priv.mux_data; |
| 82 |
-+ fallback_track = fallback->priv.mux_data; |
| 83 |
-+ sd = (int*)av_stream_new_side_data(track->st, |
| 84 |
-+ AV_PKT_DATA_FALLBACK_TRACK, |
| 85 |
-+ sizeof(int)); |
| 86 |
-+ if (sd != NULL) |
| 87 |
-+ { |
| 88 |
-+ *sd = fallback_track->st->index; |
| 89 |
-+ } |
| 90 |
-+ } |
| 91 |
-+ } |
| 92 |
-+ } break; |
| 93 |
-+ } |
| 94 |
-+ } |
| 95 |
-+ |
| 96 |
- char * subidx_fmt = |
| 97 |
- "size: %dx%d\n" |
| 98 |
- "org: %d, %d\n" |
Archives