aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2008-03-20 01:22:37 +0800
committerahze <ahze@FreeBSD.org>2008-03-20 01:22:37 +0800
commit4e25f0833d605e09e5b150ecac42b8f8c94b6c74 (patch)
tree8acd267e906ddb13741d5ef3fe1da9081e5acc82
parentf3f1c81f06897b4c2134778a98096cc1ec1f7106 (diff)
downloadfreebsd-ports-gnome-4e25f0833d605e09e5b150ecac42b8f8c94b6c74.tar.gz
freebsd-ports-gnome-4e25f0833d605e09e5b150ecac42b8f8c94b6c74.tar.zst
freebsd-ports-gnome-4e25f0833d605e09e5b150ecac42b8f8c94b6c74.zip
Fix build with new libebml
PR: ports/121707 Reported by: Howard Goldstein <hg@cally.queue.to> Submitted by: Jonathan Lennox <lennox@cs.columbia.edu>
-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" );