Commit Graph
32266 Commits
Author SHA1 Message Date
reimar 415b948f2e demuxer.c: reset subtitle EOF on seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32031 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 5c083f82ca loader: Disable loading codecs from the current directory
While convenient, it is too risky.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32025 b3059339-0415-0410-9bf9-f77b7e298cf2

100l, we need to search for SetDllDirectoryA instead of SetDllDirectory

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32026 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 04b8751a5c configure: make libarts check verify linking
Fix arts check to actually check linking so it doesn't
get enabled when e.g. cross-compiling under Linux for Windows.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32024 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
compn 26fb47e54c codecs.conf: add matchware screen codec fourcc MWSC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32022 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 477769e6b3 manpage: Clarify the meaning of the -nosub option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32014 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego 740c927976 ad_ffmpeg, vd_ffmpeg: remove pointless casts
Remove pointless casts of avcodec_find_decoder_by_name() return value.
avcodec_find_decoder_by_name() already returns AVCodec*, so there is
no need to cast the return value to this type.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32007 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 0e82595632 demux_lavf: print subtitle type in more cases
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32006 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar ef7ae1b8e8 av_sub: Pass video dimensions specified in subtitle to spudec
Makes DVD-resolution PGS subs work correctly.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32005 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar a4e62de5dc stream: make stream_read_line() terminate line on EOF
Make sure we return an "empty" line on eof, to make sure we get
no buffer overflows in case some code fails to check the return value.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31999 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
rathann 39e80404fa rpm: Update to include latest x86 binary codec packs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31986 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
compn 9ad38452eb codecs.conf: add fourcc: IMM4, LZOC, DIRC, MHFY, MSA1, vvvc
add binary codecs for fourcc: IMM4, LZOC, DIRC, MHFY, MSA1
map vvvc fourcc to ffh264
works on the single vvvc sample from uncommon codecs list

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31983 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego a32a8756f5 configure: Fix documentation language variables in summary output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31981 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego 573ec84910 DOCS/xml: edit TV/radio chapters
Remove empty paragraph from TV input chapter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31977 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge TV input and TV teletext chapter into the usage chapter.
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31978 b3059339-0415-0410-9bf9-f77b7e298cf2

Restore mistakenly removed TV input chapter introduction.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31979 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge radio chapter into the usage chapter.
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31980 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego a49fb5a3d8 ao_coreaudio: fix grammar/spelling in mp_msg calls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31972 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego a81c889a1d DOCS/xml: Merge CD/DVD chapter into the usage chapter
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31970 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge CD/DVD chapter into the usage chapter for all translations.
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31971 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego e66b13ab65 Makefile: remove distclean hack for dependency files
Remove hack that skips including dependency files on distclean.
Now that dependency files are generated as a sideeffect of compilation this
workaround is no longer needed since distclean no longer tries to create them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31969 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego 022515479f DOCS/xml/zh_CN: replace usage.xml symlink to English with copy
Remove usage.xml symlink in the Chinese documentation translation.
It will be replaced with the English text in a moment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31965 b3059339-0415-0410-9bf9-f77b7e298cf2

Add copy of English usage.xml file to Chinese translation.
This will be useful to merge other parts of the Chinese translation into it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31966 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 112d8dd2fd stream_file: Simplify and document MinGW stdin hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31964 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
reimar b7d40eab7d core: Do not call *_aid_from_lang when audio_lang is NULL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31963 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
siretart 55a7d7fb2b playtree: don't try to parse playlists without recognized entries
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31961 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
siretart 733dabb37e playtree: fix segfault on empty playlist
Add a sanity check to avoid a segmentation fault in playtree.c on
empty playlists.
This is Debian Bug: http://bugs.debian.org/591525

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31960 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 920ee4dc53 spudec.c: mark a parameter const
Mark constant sws_spu_image() parameter as const, fixes the warning:
spudec.c:874: warning: passing argument 2 of 'sws_scale' from incompatible pointer type

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31959 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
reimar e2d5a13f76 stream_dvd[nav]: Add const qualifiers to string arguments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31957 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
reimar a62d145bdf Simplify code: make open_stream() accept NULL file_format argument
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31952 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego fb46c7bdbe DOCS/xml: Remove pointless compilation sections from radio and TV input chapters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31947 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 15fee47bc6 demux_ogg.c: remove unused variable
Avoid redundant use of variable 'size' in demux_ogg_read_packet(), fixes:
libmpdemux/demux_ogg.c:266: warning: unused variable 'size'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31946 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego f01d26822e DOCS/xml: Integrate advanced audio usage sections into the general usage chapter.
This avoids an empty chapter that just contains sections.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31940 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 36a2552760 DOCS/xml: Remove bogus teletext hotkeys section
It is both wrong and misplaced.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31936 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 26541aeb8b printf format fixes ("%d" -> "%zd")
Add 'z' length modifier to %d printf format specifier for size_t argument.
stream/http.c:675: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31933 b3059339-0415-0410-9bf9-f77b7e298cf2

Add 'z' length modifier to %d printf format specifiers for size_t arguments.
libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t'
libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31935 b3059339-0415-0410-9bf9-f77b7e298cf2

Add 'z' length modifier to %d printf format specifiers for size_t arguments.
libmpdemux/demux_lmlm4.c:75: warning: format '%d' expects type 'int', but argument 5 has type 'ssize_t'
libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t'
libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 7 has type 'ssize_t'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31937 b3059339-0415-0410-9bf9-f77b7e298cf2

Add 'z' length modifier to %d printf format specifier for size_t argument.
stream/asf_streaming.c:676: warning: format '%d' expects type 'int', but argument 5 has type 'size_t'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31938 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 7e57bfd853 demux: Move mp_a52_framesize from demux_ts.c to parse_es.c
The function is used in the MPEG muxer as well and not specific to MPEG-TS.
Jointly developed by Nico Sabbi and myself.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31929 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
reimar 1e403d0593 demux_ts.c: cleanup
Remove some useless casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31921 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove an unused variable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31922 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify ts_sync. Might also make it easier to optimize a bit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31923 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
reimar 51385c6851 cosmetics: Remove useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31916 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:36 +02:00
reimar 837b6d245d cache: add sanity-check for sector size
Add sanity-check for sector size to avoid strange crashes if it is
too large.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31914 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:34 +02:00
siretart 2e6ff523dd spelling fixes
Found by the Debian QA tool 'lintian'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2

reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:03 +02:00
diego 2f1d60f422 configure: avoid unsupported options with clang on Darwin/PPC
Suppress unsupported compiler options when building with clang on Darwin/PPC.
patch by Rowan James, rowanj@phere.net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31910 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego bab0811d56 configure: Add -Wno-parentheses to CFLAGS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31909 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego bb336639a4 configure: fix OpenBSD default for CD-ROM device
The default CD-ROM device on OpenBSD is /dev/rcd0c, not /dev/rcd0a.
patch by Edd Barrett, vext01 gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31908 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 848610a002 cache: Don't mess up current position if time-based seek fails
Avoid STREAM_CTRL_SEEK_TO_TIME messing up the current position for stream
types which do not support it.
Fixes seeking in local flv files.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31907 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
alexc 9e218d2df1 loader: Add msvcr100 support to the win32 loader
This is required for the Expression Screen Codec binary decoder.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31906 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 04ce30b2fd loader: Reuse do_cpuid from cpudetect.c in loader/win32.c
Also avoids several "used uninitialized" warnings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31905 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 4843c8d7d9 cpuid.c: Remove outdated code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31904 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 1605194717 loader/win32.c: misc cleanup
Make library/export function tables static const.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31898 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid mixing code and declarations.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31899 b3059339-0415-0410-9bf9-f77b7e298cf2

Make function declarations proper prototypes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31900 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix type in conditional.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31901 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid arithmetic on void * pointers.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31902 b3059339-0415-0410-9bf9-f77b7e298cf2

Add const to avoid warnings.
The const on the return type is not correct compared to the real win32 API
functions, but that really does not matter for us, avoiding the warning is
more useful.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31903 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego 5c76f24b09 stream_dvd: Improve seeking by position
The current code takes the angle into account. This is a mistake since
the position is independent of the angle.

patch by Olivier Rolland, billl users.sourceforge net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31895 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego 0a321e01e3 stream_dvd: Improve seeking by chapters
The current code seeks to the start of the chapter. From this
position, it then tries to figure out the starting cell. This is
completely suboptimal and error prone since the starting cell can be
directly deduced from the chapter.

patch by Olivier Rolland, billl users.sourceforge net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31894 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego fdb6ce15df stream_dvd: fix incorrect assumption about chapter count
Fix the incorrect assumption that the number of chapters of a DVD
title is equal to the number of cells.

patch by Olivier Rolland, billl users.sourceforge net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31893 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 91565a3d77 vo_gl.c: Use early return instead of large if block
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31887 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31888 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 0edb9e62d0 vo_gl: Make OSD rendering code more readable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31886 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 431183c03f options: Also allow setting msglevel for MSGT_FIXME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31885 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:48 +02:00
reimar 3f4dd2f833 dvdcss: Fix typo in documentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31884 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 2fadc18008 dvdcss: Handle failing ioctls more gracefully
Also set b_scrambled and b_ioctls in the dvdcss_test function
instead of both in and outside it and in case of b_scrambled
forgetting to set it half of the time.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31883 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00