Fix yet another stupid overshight on my part.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4753 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/libmkv/A01-hbmv-pgs.patch b/contrib/libmkv/A01-hbmv-pgs.patch
index ed83c51e8c3a790aab5c173e68e4f243558a8ccc..9f863cac4122691cad676d7ba3a4a0674e19c997 100644 (file)
--- a/contrib/libmkv/A01-hbmv-pgs.patch
+++ b/contrib/libmkv/A01-hbmv-pgs.patch
@@ -10,15 +10,3 @@ index 146a91f..f03d608 100644
  
  /* Official Tags */
  #define MK_TAG_TITLE          "TITLE"
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -94,6 +94,7 @@ extern "C" {
- #define MK_SUBTITLE_USF    "S_TEXT/USF"
- #define MK_SUBTITLE_VOBSUB "S_VOBSUB"
- #define MK_SUBTITLE_BMP    "S_IMAGE/BMP"
-+#define MK_SUBTITLE_PGS    "S_HDMV/PGS"
- 
- /* Official Tags */
- #define MK_TAG_TITLE          "TITLE"

diff --git a/contrib/libmkv/A02-audio-out-sampling-freq.patch b/contrib/libmkv/A02-audio-out-sampling-freq.patch
index 12c05dda75034a086822f537f3400cabf859a32f..ea31957c1d29f9da249da6291fef4d79c13340a4 100644 (file)
--- a/contrib/libmkv/A02-audio-out-sampling-freq.patch
+++ b/contrib/libmkv/A02-audio-out-sampling-freq.patch
@@ -26,31 +26,3 @@ index f9c7e48..a2a60ca 100644
                        /* Channels */
                        if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
                                return NULL;
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
-               } video;
-               struct {
-                       float samplingFreq;     /* Sampling Frequency in Hz */
-+                      float outputSamplingFreq;       /* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
-                       unsigned channels;      /* Number of channels for this track */
-                       unsigned bitDepth;      /* Bits per sample (PCM) */
-               } audio;
-diff --git a/src/tracks.c b/src/tracks.c
-index f9c7e48..a2a60ca 100644
---- a/src/tracks.c
-+++ b/src/tracks.c
-@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
-                       /* SamplingFrequency */
-                       if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
-                               return NULL;
-+                      if (tc->extra.audio.outputSamplingFreq) {
-+                              /* Output SamplingFrequency */
-+                              if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
-+                                      return NULL;
-+                      }
-                       /* Channels */
-                       if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
-                               return NULL;