1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-30 23:38:10 +00:00
Commit Graph

32415 Commits

Author SHA1 Message Date
cigaes
579d743159 audio: auto-add downmix filter when stereo output is requested
When -channels 2 [default] is specified and the audio decoder used
does not support internal downmixing, automatically add a pan filter
after the decoder to downmix to stereo.

Patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32356 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
Uoti Urpala
6335de8621 libaf: add opts pointer to struct af_stream 2010-11-02 04:18:07 +02:00
Uoti Urpala
4c92247437 ad_libdca: fix assert failure on -channels >6
The decoder had an assert from back when max channels was 6, causing a
crash if the user specified -channels 7 or -channels 8. Change the
decoder to behave as if -channels 6 had been specified in that case
instead.
2010-11-02 04:18:07 +02:00
Uoti Urpala
4de0369e8d options: move audio_output_channels, audio_output_format to struct 2010-11-02 04:18:07 +02:00
diego
45e1333581 Makefile: don't list dependencies for codec-cfg.d
The file is now generated as a side effect of compilation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32355 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
704c65850b configure: Add HAVE_STDLIB_H to config.h for libfaad2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32350 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
c8a97067aa libdvdcss: Sync some minor changes from upstream, up to r237
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32349 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
a9131fefe4 Makefile: Remove __USE_UNIX98 from libdvd* CFLAGS
This is an internal glibc symbol that should not be used directly.
Besides, other CFLAGS already take care of enabling single Unix v2.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32348 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
reimar
7dd0d8f6df af.c: Minor simplification of af_init
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32347 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
reimar
8d466ff705 af.c: add "const" to af_append(), af_prepend() prototypes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32346 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
c6097fd5f6 Makefile: Do not compile libfaad2 with -D_GNU_SOURCE
It is not necessary and libfaad2 itself does not do it either.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32344 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
65e3208b1a libfaad2: make a function static
Mark output_to_PCM_sux as static, it is not used outside of the file; fixes:
libfaad2/output.c:465: warning: no previous prototype for 'output_to_PCM_sux'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32343 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
4c904953b5 configure: Move network requirement check for FTP into the FTP test
This makes the FTP test self-sufficient and reduces complexity.

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

Add proper autodetection for FTP support; should fix Bugzilla .

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32377 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
6939bd8c9c configure: Move ASMALIGN check into x86 section
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32337 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
1cf83abdad libfaad2: change lrintf availability logic
Remove local HAVE_LRINTF hack; it should no longer be necessary.

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

Do not compile libfaad2's lrintf() implementation if __STDC_VERSION__ is set.
This should be enough to ensure that a system lrintf implementation exists.

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

Check for __STDC_VERSION__ >= 199901L before declaring lrintf().
This is the correct condition according to the standard.

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

Fix condition for compiling lrintf, fixes compilation on cygwin/MinGW.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32391 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
6a5b528749 libfaad2: Restore trailing whitespace in local diff file
Without it, emacs has trouble in diff mode.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32334 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
06e7123bbe Makefile: Drop separate compilation rules for dhahelperwin files
The generic rules should work just as well.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32333 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
bd2189a814 Makefile: Merge dhahelperwinclean and dhahelperclean targets
There is no need to have them separate; in other clean rules we
make an effort to clean up all platforms at the same time.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32331 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
b1013d34ad TOOLS/subrip: fix linking failure
Work around linking failure due to unresolved reference to mplayer_version.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32328 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
diego
baf7744d53 Makefile: Remove remnants of explicit dependency file generation
Dependency files are now generated as a side effect of compilation,
and have no independent creation rules.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32327 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:05 +02:00
diego
908b80e21c Makefile: Fix osdep/mplayer.rc.o vs. osdep/mplayer-rc.o typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32326 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:04 +02:00
diego
d5fc361dd8 Makefile: read dependency files for assembler files too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32321 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:04 +02:00
diego
80c21dd312 Makefile: Rename DEPS variable to DEP_FILES
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32320 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:04 +02:00
diego
1f93c3b5ed configure: simplify libbluray test
Remove unnecessary #include from libbluray test.

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

Simplify libbluray test with function_check().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32316 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:04 +02:00
reimar
044fc491fa demux_mkv: fix decoded length calculation of LZO decompression
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32305 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:04 +02:00
Uoti Urpala
7aa202d9a7 demux_mkv: add some sanity checks
Add some checks to prevent bad files from creating arbitrarily large
buffer blocks (which could result in integer overflows and memory
corruption). Remove a test with little use from demux_mkv_decode(); it
compared an int with size_t, and was useless on 64-bit platforms at
least.
2010-11-02 04:17:04 +02:00
diego
b9e50fb409 configure: Make sure that HAVE_MKSTEMP is always #defined to a value
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32303 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:17:04 +02:00
diego
57a209ddd5 configure: Make sure that CONFIG_LIBMP3LAME is always #defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32301 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:57 +02:00
diego
755ae2801d configure: Add function_check_broken(), simplify test
It can be used similar to header_check_broken, but it also tests for the
availability of functions along with the needed headers.

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

Simplify libdca check using function_check_broken().

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

1000l: Fix shift amount in function_check_broken().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32311 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
diego
7cbcdddb2d configure: minor cleanups
cosmetics: Slightly shorten swab() check.

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

cosmetics: Slightly reformat a comment.

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

cosmetics: Drop a bunch of unnecessary parentheses from big-endian check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32300 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
reimar
3e40d5f9aa configure: Fix compilation on Windows: MinGW unistd.h does not define NULL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32295 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
diego
3a5a47ccc2 configure: Ignore possible errors from dvdread-config invocation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32290 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
diego
386c15a409 configure: change VESA test to check for vbeInit() instead of vbeVersion()
The former actually exists in vbe.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32289 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
diego
efd24e30dd vesa_lvo.c: make functions static
Mark functs not used outside of the file as static, remove from header; fixes:
libvo/vesa_lvo.c:187: warning: no previous prototype for 'vlvo_draw_slice'
libvo/vesa_lvo.c:205: warning: no previous prototype for 'vlvo_draw_frame'
libvo/vesa_lvo.c:214: warning: no previous prototype for 'vlvo_flip_page'
libvo/vesa_lvo.c:275: warning: no previous prototype for 'vlvo_draw_osd'
libvo/vesa_lvo.c:312: warning: no previous prototype for 'vlvo_query_info'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32288 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
diego
14c22f8236 vesa_lvo.c: Move vlvo_preinit() below the functions that it uses
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32287 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
03e539f38c vo_vesa: Mark vlvo_draw_slice_420() as static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32286 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
c310e7cedc vo_vesa: mark a function static
Mark fillMultiBuffer() as static, it is not used outside of the file; fixes:
libvo/vo_vesa.c:532: warning: no previous prototype for 'fillMultiBuffer'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32284 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
29dcd8808d DOCS/xml: Remove outdated warning about obsolete gcc 2.96.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32283 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
21ea779e7a vo_vesa, vo_directfb2: Replace local min/max macros by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32282 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
e25bc29143 cfg-mplayer.h: Remove old obsolete warning about dfbopts
The DIRECTFBVERSION macro that it depends on has been removed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32281 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
ramiro
32013b621c vo_mga: use libswscale interface for g200 (untested)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32280 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
4bf35fe2ba configure: misc whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32278 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
ed97d9cfab configure: simplify and improve some checks
Simplify esd checks using function_check().

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

Simplify OS/2 header checks using header_check_broken().

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

Simplify libggiwmh check using function_check().

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

Add _XOPEN_SOURCE >= 500 #define to mkstemp check; mkstemp() requires it.

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

Simplify mkstemp() check.

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

Simplify termcap check.

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

Simplify glob() check.

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

Add missing stdio.h #include to the test program in the PNG check.

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

Remove pointless sys/ioctl.h #includes from OSS audio checks.

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

Slightly restructure OSS audio check; fixes the warning:
tmp.c:2: warning: unused variable 'arg'

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

Simplify check for external dvdread.

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

100l: Set _XOPEN_SOURCE to a proper integer value.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32274 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
7452eb2948 vo_caca: Update URL to patch for new API support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
868fb5d278 build: update DirectFB requirements, reduce #ifdefs
Require DirectFB version 0.9.15 instead of 0.9.13.
This simplifies the build system at the cost of requiring a library
version that was released at the end rather than the middle of 2002.

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

Simplify DirectFB check.

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

Require DirectFB version 0.9.22.
This allows getting rid of a lot of library version check #ifdeffery.
Release 0.9.22 is from February 2005, so the requirement is reasonable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
7c5e3a1933 configure: cosmetics: Replace some double quotes by single quotes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32247 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
d114f96b2e configure: add inline_asm_check() and simplify some tests
Add inline_asm_check function to simplify configure checks.

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

Use inline_asm_check to simplify a bunch of configure checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32244 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
8ef19870e2 configure: simplify some checks
Simplify dynamic loader check.

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

Simplify DirectFB check using function_check().

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

Simplify FreeType check.

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

Simplify math function checks.

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

Simplify mman.h/mmap check.

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

Simplify libdv test.

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

Remove pointless casts from configure checks.

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

Simplify a bunch of configure checks through the use of function_check().

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

Simplify kstat check.

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

Simplify libggiwmh check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
54230cd539 configure: fix warnings in check programs
Mark local functions in configure tests as static; fixes the warnings:
tmp.c:1: warning: no previous prototype for 'foo'
tmp.c:2: warning: no previous prototype for 'func'
tmp.c:3: warning: no previous prototype for 'catch'

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

Add some missing headers to configure checks; fixes the warnings:
tmp.c:3: warning: implicit declaration of function 'exit'
tmp.c:6: warning: implicit declaration of function 'printf'
tmp.c:4: warning: implicit declaration of function 'printf'

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

Fix parameter types in swab() check; fixes the warnings:
tmp.c:3: warning: null argument where non-null required (argument 1)
tmp.c:3: warning: null argument where non-null required (argument 2)

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

Remove unnecessary extern declarations from aalib check; fixes the warnings:
tmp.c:2: warning: redundant redeclaration of 'aa_defparams'
tmp.c:3: warning: redundant redeclaration of 'aa_defrenderparams'

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

Remove bogus cast from configure check; fixes the warning:
tmp.c:21: warning: passing argument 2 of 'iconv' from incompatible pointer type

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

Initialize variable in libspeex configure check; fixes the warning:
tmp.c:2: warning: 'dec' is used uninitialized in this function

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

Initialize variable in giflib check; fixes the warning:
tmp.c:5: warning: 'gif.UserData' is used uninitialized in this function

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

Cast return value to long instead of int in byte order check.
This avoids the following warning on 64 bit systems:
tmp.c:3: warning: cast from pointer to integer of different size

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32250 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
Uoti Urpala
db59b85fed Makefile: remove obsolete DIRS list entries 2010-11-02 04:16:55 +02:00