1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-20 22:02:59 +00:00
Commit Graph

27475 Commits

Author SHA1 Message Date
diego
0e970b49f0 Put '#define closesocket close' under proper '#ifndef HAVE_CLOSESOCKET'
preprocessor condition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27506 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-01 07:35:05 +00:00
diego
788a4d5f91 Move '#define closesocket close' preprocessor directive to a common place
and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27505 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-01 07:31:57 +00:00
diego
f27f04a53d Revert moving closesocket definition and network headers to network.h.
This caused lots of trouble on MinGW, we need a different solution.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:59:54 +00:00
diego
133f1f8872 Only use winsock2.h to check for closesocket().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27503 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:56:18 +00:00
diego
ef7ea669d0 Fix closesocket test, patch by Serge Levin, serge.levin.spb gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27502 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:54:08 +00:00
diego
959c047930 Add necessary #include <stdlib.h> for realloc/calloc/free.
patch by JonY, 10walls gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27501 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:05:33 +00:00
reimar
daa3eda91f Remove unused GUID_t definition that also incorrectly defined GUID_DEFINED
(while actually not defining GUID, only GUID_t).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27500 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 11:21:29 +00:00
stefano
e372474088 Change header inclusion guard names in line with FFmpeg r15120.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27499 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 07:42:11 +00:00
rathann
97e5f304ce Rename internal libdvdread fork from dvdread to libdvdread
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 12:22:21 +00:00
reimar
fd75ca0c6a Print DVD volume ID with -identify.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 11:21:11 +00:00
diego
c152b07e66 Move duplicated '#define closesocket close' into network.h along with
network-related #include #ifdeffery.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:55:39 +00:00
diego
2a90e559a9 consistency cosmetics: Avoid using .. in #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:29:27 +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
3af860b877 Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
This is what it is called in FFmpeg and more consistent with other
names for similar conditionals. This fixes a potential compilation
failure on MinGW, as described in Bugzilla #1262.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 20:05:08 +00:00
stefano
6c30638aa1 Implement swscale_version().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27492 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 18:23:54 +00:00
diego
fea35f288a Remove pointless '#if 1 [...] #endif' around has_cpuid() function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27491 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 17:44:51 +00:00
diego
6556d2c632 Implement check for closesocket(), needed by libavformat, fixes Bugzilla #1257.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27490 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 16:20:35 +00:00
aurel
a5f69284d9 handle the lavfpref demuxer in the same way as the lavf one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 11:31:53 +00:00
ptt
b5ddaf20ba synced with r27454
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27488 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 11:07:15 +00:00
ptt
52d208149f sync'ed to r27071
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27487 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 10:58:15 +00:00
diego
159ef5f70e Drop av_always_inline definition. It is duplicated from libavutil and
unlikely to make any difference. This reduces the diff to upstream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27486 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-26 22:38:12 +00:00
diego
03337f15ad Rename always_inline macro to av_always_inline so as not to clash with
with __attribute__((always_inline)) declarations.
This fixes the build on Mac OS X 10.4.11.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27485 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-26 21:29:54 +00:00
aurel
6c675482ff prefer libavformat to demux matroska files
I can't spot any regression anymore. If you find one, please tell me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27484 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-26 21:12:48 +00:00
reimar
c1751adcc1 Fix forumla -> formula in comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27483 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-26 18:41:04 +00:00
ranma
4445a58fd3 Fix 'cast from pointer to integer of different size' on 64bit architectures. Casting to long should work for 32bit and 64bit and not make a difference to the boolean operation (since 'format' is always 32bit (int) the upper 32bit of 'arg' won't matter, but the compiler should be happy now. Casting both to unsigned makes sure the compiler isn't messing things up by sign-extending 'format' to 64bit before masking)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27482 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 13:52:54 +00:00
ranma
7f26ceaa54 Handle AOPLAY_FINAL_CHUNK
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27481 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 13:36:04 +00:00
aurel
6d97b19a73 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27480 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 00:08:55 +00:00
aurel
68ac7b23dd use new lavf API to grab sample_aspect_ratio from the demuxers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27479 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 00:07:09 +00:00
ranma
d5df440c7f fix compiler warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27478 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-23 08:14:37 +00:00
diego
934670b5ce Remove unused and untested function. It is only part of our local patchset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27477 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-22 21:35:38 +00:00
diego
984d028cd2 Remove duplicate vsscanf fallback implementation, we have another in osdep/.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27476 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-22 20:53:44 +00:00
reimar
d54c1f0309 -geometry support for -vo fbdev.
Patch by Sander (thrill12 gmx net)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27475 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-22 17:26:16 +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
e9e576a0a6 Add support for AAC decoding through FFmpeg; libfaad is preferred for now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27473 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-21 11:00:47 +00:00
diego
96a6782c43 cosmetics: Remove trailing whitespace and tabs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27472 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-21 09:52:47 +00:00
diego
c7c06f3050 Remove SKIP_DEPS trick. The same effect can be achieved without it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-18 06:30:10 +00:00
diego
2e3a315796 fix for alignment problem on older ARM cores
patch by Siarhei Siamashka, siarhei.siamashka gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27470 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-17 22:32:30 +00:00
diego
4275dadf52 Add check for ARM VFP instructions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27469 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-17 22:02:05 +00:00
gpoirier
d9249395c4 sync w/r27466
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27468 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-15 19:48:09 +00:00
diego
5a4496ca5d Work correctly with very small files where less than outburst is to be played.
patch by Tobias Diedrich, ranma tdiedrich de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27467 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-15 17:14:53 +00:00
michael
a42593f347 Document -lavcopts o, aka libavcodec AVOption.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27466 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-15 11:40:01 +00:00
diego
5c30ab6feb FFmpeg no longer has fastmemcpy support, so no longer trigger recursing
into the FFmpeg directories if libvo/fastmemcpy.h changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 20:42:54 +00:00
diego
3932c5e0b9 Remove unused static declarations, fixes the warnings:
libmpcodecs/vd_qtvideo.c:69: warning: 'ImageCodecDrawBand' defined but not used
libmpcodecs/vd_qtvideo.c:71: warning: 'ImageCodecEndBand' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27464 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 16:04:32 +00:00
diego
511729a3a2 Use '#include <poll.h>' instead of '#include <sys/poll.h>'.
It is the standard location as defined by the Open Group.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27463 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 15:54:53 +00:00
diego
20e0b5c831 100l: Rename missed preprocessor directives from a HAVE_ prefix to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27462 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 15:48:11 +00:00
aurel
d745a24978 add mapping for real audio and video CODEC_ID to MPlayer's fourcc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27461 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-13 22:09:33 +00:00
compn
0e817b4d74 fixes spotted by diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27460 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-13 18:22:10 +00:00
aurel
03e568867e demux_lavf: fix mp_seek behavior in case of seeking error
When trying to seek past the end of file, the ByteIOContext expect
that the stream is left in the same state as it was before the
tentative seek. stream_seek() does not meet this expectation.
It changes current position when seeking past the end of file.
Thus, it is necessary to reset the stream to its previous state
after a seek failure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27459 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-13 00:01:31 +00:00
diego
f88bf0c7b7 Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27458 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:38:30 +00:00
diego
51700fd1f5 Remove useless DVB-related #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27457 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:33:15 +00:00