summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2008-03-19 17:22:37 +0000
committerMichael Johnson <ahze@FreeBSD.org>2008-03-19 17:22:37 +0000
commitc618a3d9272733cd672d6a6fcdabfec32dbb2bd4 (patch)
tree5fe47be979a1e1653fb8041e796212d2dec32d52 /multimedia
parent- Update Tcl/Tk dependenceis to 8.4 (diff)
Fix build with new libebml
PR: ports/121707 Reported by: Howard Goldstein <hg@cally.queue.to> Submitted by: Jonathan Lennox <lennox@cs.columbia.edu>
Notes
Notes: svn path=/head/; revision=209389
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc/files/patch-modules_demux_mkv.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/multimedia/vlc/files/patch-modules_demux_mkv.cpp b/multimedia/vlc/files/patch-modules_demux_mkv.cpp
new file mode 100644
index 000000000000..a9b041021953
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_demux_mkv.cpp
@@ -0,0 +1,20 @@
+--- modules/demux/mkv.cpp.orig 2008-02-24 14:01:53.000000000 -0500
++++ modules/demux/mkv.cpp 2008-03-19 13:11:29.000000000 -0400
+@@ -5845,7 +5845,7 @@
+ binary *p_data = (*index)->GetBuffer();
+ size_t i_size = *p_data++;
+ // avoid reading too much from the buffer
+- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
++ i_size = min<size_t>( i_size, ((*index)->GetSize() - 1) >> 3 );
+ for ( ; i_size > 0; i_size--, p_data += 8 )
+ {
+ msg_Dbg( &sys.demuxer, "Matroska DVD enter command" );
+@@ -5868,7 +5868,7 @@
+ binary *p_data = (*index)->GetBuffer();
+ size_t i_size = *p_data++;
+ // avoid reading too much from the buffer
+- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
++ i_size = min<size_t>( i_size, ((*index)->GetSize() - 1) >> 3 );
+ for ( ; i_size > 0; i_size--, p_data += 8 )
+ {
+ msg_Dbg( &sys.demuxer, "Matroska DVD leave command" );