Add PGS codec ID to libmkv and use it.

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

diff --git a/contrib/libmkv/A01-hbmv-pgs.patch b/contrib/libmkv/A01-hbmv-pgs.patch
new file mode 100644 (file)
index 0000000..ed83c51
--- /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 16cd2ac5b40b72def9ceec37a2431e0bd5bc2a8b..25b111b908c9e6df2043662c8f613dae0cc1d282 100644 (file)
--- 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;