summaryrefslogtreecommitdiffstats
path: root/contrib/patch-mpeg4ip.patch
diff options
context:
space:
mode:
authorprigaux <[email protected]>2007-03-06 21:15:55 +0000
committerprigaux <[email protected]>2007-03-06 21:15:55 +0000
commitc4a642b4648d486777af91ccc2894355df447089 (patch)
tree4ff9eee3e39a530cb649d9db43456e0ab3d712a3 /contrib/patch-mpeg4ip.patch
parentff5ed5d2a2009504f1da3cf348689a59a82b27f1 (diff)
Merge the 5.1 branch into the trunk.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/patch-mpeg4ip.patch')
-rw-r--r--contrib/patch-mpeg4ip.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/contrib/patch-mpeg4ip.patch b/contrib/patch-mpeg4ip.patch
new file mode 100644
index 000000000..8a55c5da2
--- /dev/null
+++ b/contrib/patch-mpeg4ip.patch
@@ -0,0 +1,23 @@
+diff -Naur mpeg4ip/lib/mp4v2/atom_tkhd.cpp mpeg4ip_patched/lib/mp4v2/atom_tkhd.cpp
+--- mpeg4ip/lib/mp4v2/atom_tkhd.cpp 2003-11-19 23:46:11.000000000 +0000
++++ mpeg4ip_patched/lib/mp4v2/atom_tkhd.cpp 2007-02-15 15:58:06.000000000 +0000
+@@ -61,7 +61,8 @@
+ pProp->SetFixed16Format();
+ AddProperty(pProp); /* 8 */
+
+- AddReserved("reserved3", 38); /* 9 */
++ /* patched by maurj to enable us to set the matrix for anamorphic display */
++ AddProperty(new MP4BytesProperty("reserved3", 38)); /* 9 */
+
+ pProp = new MP4Float32Property("width");
+ pProp->SetFixed32Format();
+@@ -106,7 +107,8 @@
+ m_pProperties[9]->SetReadOnly(false);
+ ((MP4BytesProperty*)m_pProperties[9])->
+ SetValue(reserved3, sizeof(reserved3));
+- m_pProperties[9]->SetReadOnly(true);
++ /* patched by maurj to enable us to set the matrix for anamorphic display */
++ /* m_pProperties[9]->SetReadOnly(true);*/
+ }
+
+ void MP4TkhdAtom::Read()