Commit Graph

775 Commits

Author SHA1 Message Date
Uoti Urpala ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
komh f74d169fc6 Include libavutil/avutil.h for FFMIN
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30881 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-10 11:33:02 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala 240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala 0dce155dd3 Merge svn changes up to r30694 2010-03-10 01:01:15 +02:00
Uoti Urpala 13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala 8365d174b6 Merge svn changes up to r30557 2010-03-09 23:09:46 +02:00
Uoti Urpala bc0f524909 Merge svn changes up to r30502
Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h
	libswscale/swscale.c
	libvo/x11_common.c
2010-03-09 19:44:28 +02:00
Uoti Urpala f1b6cdbe9d Merge svn changes up to r30484 2010-03-09 19:24:47 +02:00
Uoti Urpala b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
Uoti Urpala 5234c72e28 Restore collapsed whitespace in output messages
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
2010-03-07 21:34:54 +02:00
diego c106fe7751 Drop support for old-style DVB code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 19:57:17 +00:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
diego 9c856aeffe Mark theRenderProc() as static, it is only used within the file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30718 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-23 07:54:43 +00:00
tack 2f19fe91ec Output WAVE_FORMAT_EXTENSIBLE extension in wave header when waveheader
option is enabled (default) and channels > 2.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30708 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:24:53 +00:00
diego 6ad59a1eae Mark data argument of my_ao_write() function as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30706 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:05:30 +00:00
diego b18b59b8d4 Add header for v4l2_write() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 23:31:56 +00:00
diego 8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:02:49 +00:00
diego d306b727b1 Remove pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 10:22:29 +00:00
diego 93c1e23c47 Mark some more functions that are not used outside of their files as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 09:26:00 +00:00
diego 11b55ec7a8 Fix exit_player() usage throughout the codebase.
exit_player() was declared with differing parameter types in mplayer.c and
mplayer.h. Make the declaration in the .h file match the one in the .c file
and adjust all usages of exit_player() throughout the codebase. Also move
the exit_player() declaration into mp_core.h next to exit_player_with_rc().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 10:53:20 +00:00
diego 1b3d1fcd9d Remove unused variables, fixes the warnings:
libao2/ao_mpegpes.c:336: warning: unused variable 's'
libao2/ao_mpegpes.c:335: warning: unused variable 'i'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30555 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-13 21:29:32 +00:00
komh bc802c1e3e Audio buffer is too large so that it takes too long time to respond to audio
control such as software volume control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30502 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 14:42:57 +00:00
komh f275d3d32c Add OS/2 KAI audio driver support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-01 14:09:53 +00:00
reimar a91702125c Explain why we still disable the ALSA resampler even though it is probably
actually working nowadays.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30452 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-28 18:26:12 +00:00
Uoti Urpala d84685ce13 Merge svn changes up to r30448 2010-01-28 00:54:08 +02:00
reimar 4c211d8851 Declare variable closer to where it is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30444 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:23:19 +00:00
reimar 882ce0cd5e Remove a useless global variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30443 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:21:27 +00:00
reimar 5f326498f7 Do not needlessly make local variable static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30442 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:16:41 +00:00
reimar 051d3210c7 Remove useless initializers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30441 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:11:15 +00:00
reimar 01a39f2fc3 Do not needlessly use (file-)global variables.
Since they also were initialized to a value and non-constant (changed
by ALSA) this might actually have caused bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30440 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:10:07 +00:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Uoti Urpala 69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar a92b3d446b Support more formats for -ao pcm in raw mode.
Patch by Peter Fordham [peter.fordham gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30400 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 11:21:56 +00:00
reimar e8dded6d4f MPlayer's format now correctly identifies AC3 as either little- or big-endian,
remove unnecessary special workaround.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30284 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 20:29:33 +00:00
reimar 33bc71f10d Add support for distinguishing between little- and big-endian SPDIF AC3
and converting between both.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 20:27:52 +00:00
reimar d3ae3611ce More uses of AF_FORMAT_IS_AC3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30282 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 20:02:46 +00:00
reimar d4b1ff0d03 Use AF_FORMAT_IS_AC3 in ao_oss.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30281 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:55:07 +00:00
reimar e3c9e9a09b Use af_fmt2bits, it should give more sensible values than snd_pcm_format_physical_width,
especially for AC3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30279 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:40:58 +00:00
reimar 10321db5c0 Use af_fmt2bits instead of reimplementing it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30277 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:26:33 +00:00
reimar 6910cdaae1 Add and use AF_FORMAT_IS_AC3 macro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30276 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:23:18 +00:00
Uoti Urpala b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala 231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
reimar c23a01e260 Fixup SDL configure check:
- Make it work without sdl-config which adds at least useless or even hurtful
  cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
  instead of something else. Thus #undef main is needed in the test program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 11:33:33 +00:00
reimar 92cd6dc3e9 Simplify range-checking functions for subopt parsing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:23:16 +00:00
reimar f102ac7a8c Fix function declarations to avoid casting function pointers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:18:49 +00:00
Uoti Urpala 67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02:00