1
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00
Commit Graph

34 Commits

Author SHA1 Message Date
reimar
06d20bd774 Sync libdvdcss with their latest SVN.
In particular fixes a wring return value check which caused descrambling
to be aborted for no good reason.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31319 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:41:43 +00:00
diego
6f3e65b6f5 libdvdcss: Fix potential format string crash; check RPC status on disc access.
This merges upstream revisions 223 and 224 + 225.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31157 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 11:10:28 +00:00
diego
ec814ff637 libdvdcss: OS/2 support; this merges upstream revisions 220 and 229.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31156 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 10:58:50 +00:00
diego
da988249d7 libdvdcss: cosmetics: Fix FSF address and program name in license headers.
This merges upstream revisions 219 and 221.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31155 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 10:51:46 +00:00
reimar
12c9fa73f3 Try other methods also if GetBusKey fails instead of failing completely.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31094 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:39:39 +00:00
diego
e915d29f0a Sync libdvdcss with upstream version 1.2.10.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27494 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 20:22:36 +00:00
diego
c2a12149e2 Sync libdvdcss with upstream version r212.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27474 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-21 13:40:16 +00:00
diego
08d224b68d Remove unused file, it has never been compiled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26740 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 14:25:47 +00:00
diego
4267826b6b Merge libdvdcss/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:27:01 +00:00
reimar
6b1453c615 Ignore if we fail to get disc key, fixes playback of one of my DVDs which
claims to be scrambled but actually is not, and always allows to
fallback to cached keys.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26266 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-21 12:31:47 +00:00
diego
1aac3c3fde Fix #endif comment, sync with libdvdcss r208.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25645 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 22:46:53 +00:00
diego
abf8510716 Leading underscores in identifiers are reserved in C.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24555 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-17 13:08:51 +00:00
diego
fd670000d9 warning fix:
libdvdcss.c:145: warning: redundant redeclaration of 'dvdcss_interface_2'
dvdcss/dvdcss.h:70: warning: previous declaration of 'dvdcss_interface_2' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24554 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-17 13:07:06 +00:00
diego
139d5f7fca Move some #defines into configure/config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24031 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-08 09:12:33 +00:00
diego
8a0954e802 HAVE_INTTYPES_H is already declared in config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24018 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-07 08:34:00 +00:00
iive
fd11b253b9 Fix crash on some DVDs
sprintf(tmp,"%.02x",(char)0xef); would print "ffffffef" instead of "ef",
in this case this leads to local array buffer overflow and hard to trace stack corruption.
The quick, easy & durty solution is to use (unsigned char) or (uint8_t)
Fixes Bugzilla 860 & 845


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23728 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-06 23:22:51 +00:00
reimar
7138540983 Fix CSS format strings, they could print more than two digits for
"negative" numbers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23727 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-06 22:07:35 +00:00
diego
8c3f78b90d Move setting Cygwin specific CFLAGS to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22739 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-19 00:03:00 +00:00
diego
c894cefcf9 whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22644 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-16 22:25:17 +00:00
diego
2de1b693f0 Remove duplicate largefile CFLAGS that are set from configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22643 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-16 22:24:15 +00:00
diego
e8a92a21ec Remove unnecessary Darwin entry from CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22614 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 13:21:12 +00:00
diego
5519d98983 cosmetics: Fix indentation, reorder some lines for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 21:55:23 +00:00
diego
60b39e2786 Give more descriptive names to the source and library variables and split
between common, MPlayer-specific and MEncoder-specific parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 12:10:57 +00:00
diego
dc2be42703 Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
diego
377db6bc69 Unconditionally include config.mak for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21231 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:11:48 +00:00
diego
7b4015bf3b more consistency with the other Makefiles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21230 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:09:25 +00:00
diego
27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
diego
cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
diego
b2e4995772 Remove bogus OPTFLAGS settings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20819 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 16:44:58 +00:00
diego
e19c97bfd4 Fix linking on Cygwin and remove nonsense lseek64 --> lseek indirection,
all in one fell swoop.  Patch by yours truly accepted upstream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20746 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 16:42:39 +00:00
diego
863ec4e1a2 Remove bogus comment lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20745 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 16:40:22 +00:00
diego
f65edce1aa WIN32 was already being set from config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20729 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 20:35:16 +00:00
diego
dbf735cd31 Add -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 to CFLAGS like upstream does.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20724 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 19:06:32 +00:00
diego
689d0cc0f4 Move libdvdcss into its own subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20629 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 12:25:56 +00:00