summary refs log tree commit diff
path: root/pkgs/applications/video/handbrake
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-07-18 20:51:56 +0800
committerPeter Hoeg <peter@hoeg.com>2017-07-18 20:52:02 +0800
commit9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f (patch)
treea0954a0f75a2070dcd47073fb82ef6f9bc23ddfd /pkgs/applications/video/handbrake
parent99fbd867ef1fe7f4bbe802aec02a27ee88cf3946 (diff)
downloadnixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.tar
nixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.tar.gz
nixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.tar.bz2
nixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.tar.lz
nixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.tar.xz
nixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.tar.zst
nixpkgs-9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f.zip
handbrake: remove leftover file
Diffstat (limited to 'pkgs/applications/video/handbrake')
-rw-r--r--pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch b/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch
deleted file mode 100644
index 8539186aaa5..00000000000
--- a/pkgs/applications/video/handbrake/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"