summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-06-18 19:28:45 +0000
committerRodeo <[email protected]>2012-06-18 19:28:45 +0000
commit8a54e42212a0989823fdad941c0f7311f878ed7d (patch)
tree39463870ec49632512ef2fadb297f492e3dc5a3c
parent13f74fb405aaa811bb7ac0a4009e3a3a7e5a26e2 (diff)
Add PGS codec ID to libmkv and use it.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4749 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--contrib/libmkv/A01-hbmv-pgs.patch24
-rw-r--r--libhb/muxmkv.c2
2 files changed, 25 insertions, 1 deletions
diff --git a/contrib/libmkv/A01-hbmv-pgs.patch b/contrib/libmkv/A01-hbmv-pgs.patch
new file mode 100644
index 000000000..ed83c51e8
--- /dev/null
+++ b/contrib/libmkv/A01-hbmv-pgs.patch
@@ -0,0 +1,24 @@
+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/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/libhb/muxmkv.c b/libhb/muxmkv.c
index 16cd2ac5b..25b111b90 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -347,7 +347,7 @@ static int MKVInit( hb_mux_object_t * m )
case PGSSUB:
track->codecPrivate = NULL;
track->codecPrivateSize = 0;
- track->codecID = "S_HDMV/PGS";
+ track->codecID = MK_SUBTITLE_PGS;
break;
case SSASUB:
track->codecID = MK_SUBTITLE_SSA;