1
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Commit Graph

436 Commits

Author SHA1 Message Date
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
b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings
Tweak some code parts that used to rely on string literals from
translation macros being concatenated with other adjacent string
literals. Break up the resulting string into independently translated
parts, so that the existing translations for those parts can still be
used.
2010-03-07 21:35:23 +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
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
reimar
dd79cbf17b Move code that makes the filter chain match the desired output format into
a separate function.
Call this function also from af_add, fixes audio corruption with e.g.
-softvol -af format=s16be (bug #1561).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30659 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 21:52:29 +00:00
reimar
3bbbb21ada Make the code match the documentation by making higher-quality but slower
audio filtering the default.
This mostly means lavcresample being the default instead of plain "resample".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30455 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 10:09:14 +00:00
Uoti Urpala
4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala
69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar
1a5841fbbb Add a proper header for our strsep implementation so strsep will
not be used without a declaration, causing issues on 64 bit systems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 15:08:31 +00:00
reimar
b27ec53011 Let the format filter do the AC3 endianness conversion instead of duplicating
the conversion code over and over.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30285 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 20:40:51 +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
76feee19c4 Add a hack to af_fmt2bits to recognize AC3 as a 16-bit format, since this
is more correct than 8 bit for alignment purposes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30278 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:37:50 +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
reimar
a8a53e872e Revert r30170, AF_FORMAT_AC3 is supposed to be the special mask,
and should not include other parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30275 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:08:15 +00:00
Uoti Urpala
d157b2a8ce Merge svn changes up to r30173 2010-01-08 01:17:56 +02:00
reimar
13fe3d4986 Mark AC3 as 16-bit format, this simplifies alignment calculation and fixes
hwac3 with ALSA reportedly broken by r29750.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30170 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 20:45:27 +00:00
Uoti Urpala
ed333bb31d Merge svn changes up to r29971 2009-11-29 06:11:02 +02:00
tack
b2adf9d98d Fix mangling of 24-bit audio during channel reorder.
Only 1/3 of the samples in the buffer passed to reorder_channel_nch()
were being reordered.  For 8-, 16-, and 32-bit audio, the buffers could
be treated as int8_t, int16_t, and int32_t respectively.  24-bit audio
was being processed as int8_t, requiring iteration over n_samples*3, not
n_samples.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29971 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-28 18:23:26 +00:00
Uoti Urpala
ac8e40b4ff af_scaletempo: Fix delay value after changing scale to 1
The scaletempo filter has a special-case check to return the samples
unchanged if the current scaling factor is 1. In this case code
setting af->delay wasn't run. If the scale had had a different value
and then been changed to 1 as a result of a playback speed change then
the delay field could have a nonzero value left, resulting in A/V sync
errors. Fix by setting the delay field to 0 in the scale == 1 special
case code.
2009-11-22 12:41:04 +02:00
Uoti Urpala
287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
tack
3c2afd6786 Add support for 8 channel audio.
Where 8 channel support is non-trivial (e.g. ao_dsound), at least ensure we
fail gracefully.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29868 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 00:45:19 +00:00
tack
1d30062395 Cosmetics: remove trailing whitespace from file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29867 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 00:43:14 +00:00
tack
b6712cc6c2 reorder_ch: Remove unneeded AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_*
All references to these values were removed r29821.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29822 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 00:58:11 +00:00
Uoti Urpala
7fd3eb0f74 Merge svn changes up to r29752
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
2009-10-06 04:48:00 +03:00
reimar
09e4467756 Change libaf control ordering to make the controls unique again, (AF_CONTROL_PAN_BALANCE vs.
AF_CONTROL_PLAYBACK_SPEED), put them in-order again and add a bit of padding in-between.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29718 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 06:41:09 +00:00
Uoti Urpala
7431eabaab Merge svn changes up to r29544 2009-08-22 04:31:30 +03:00
tack
0d0c303ebe Fix channel reordering when using 24-bit samples by adding breaks to cases
missed by r29427.

Patch submitted by Shane W, shane-mplayer csy ca


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29541 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 13:29:07 +00:00
tack
bc4cc45029 Cosmetics: adjust alignment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29534 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-18 22:25:58 +00:00
tack
f89696a8e2 Fix incorrect channel ordering for lavc audio codecs (specifically ffac3,
ffdca, ffflac, ffaac, fftruehd).  In the process, adds support for 32-bit
samples.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29533 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-18 22:24:36 +00:00
Uoti Urpala
4a36b51ea6 Merge svn changes up to r29455 2009-07-29 01:32:03 +03:00
diego
e5751ced4f Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:53:00 +00:00
Uoti Urpala
a92a43b91f build: Readd support for code depending on FFmpeg internals
Add configure option --ffmpeg-source-dir=PATH. If the user specifies
this option then building code that depends on FFmpeg internals is
enabled and the files files which use internal lavf headers will get
them from this path. The FFmpeg libraries linked with must export
needed internal symbols.
2009-07-26 20:22:48 +03:00
iive
f6c25fd5c5 Fix 24bit audio playback.
The reordering channels code had reoccurring bug
where in switch(samplesize) block the
case 3 (3 bytes) doesn't end with break;
leading to execution of the next case 4 too.
This mangles the already processed data and
causes massive memory corruption.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29427 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 09:55:29 +00:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar
e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala
1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
bircoph
fbf9a582f4 Cosmetics for r29244 to follow K&R style closely.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29245 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-03 21:52:41 +00:00
bircoph
e8abba5f43 Support for libbs2b ver. 3.0.0 API.
Now filter parameters are highly controllable, virtually all audio
formats are supported, and new profiles are available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29244 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-03 21:51:37 +00:00
Uoti Urpala
d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
bircoph
83c2df3565 Use native endian float filter provided by libbs2b instead of
selection based on WORDS_ENDIAN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29134 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 20:49:47 +00:00
bircoph
e3b6f71b2d Add libbs2b audio filter itself.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29132 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 19:01:57 +00:00
diego
2e903f7c75 Remove unnecessary malloc.h #includes and related #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 09:20:48 +00:00
Uoti Urpala
cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
bircoph
fa804e5d97 Move config.h include directive up as a precaution measure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29091 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 20:21:20 +00:00
bircoph
29fc3d6601 Reorder includes alphabetically.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29090 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 20:03:08 +00:00
bircoph
e3455c5b20 Remove af_mp.h and add its content to af.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29089 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 20:01:43 +00:00
bircoph
42a792bbc7 Remove af_msg special-casing API in libaf.
Replace it by standard mp_msg message system.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29088 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 19:57:56 +00:00
diego
a21feef029 cosmetics: Remove file names from file header, it only causes trouble.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28959 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 12:45:16 +00:00
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
reimar
b6d7a2552c Remove several useless casts from af_resample
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 11:47:51 +00:00
reimar
c2574a6b0a Free af->setup and contents in af_resample uninit function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28847 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 11:46:06 +00:00
reimar
37a09a25ff Use calloc to allocate the af_resample ring buffers, reportedly using
non-zeroed buffers can cause initial noise, see -dev-eng:
[PATCH]: Add missing memset after malloc in libaf/af_resample.c
Wed, 4 Mar 2009 15:29:30 +0800


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28846 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 11:42:45 +00:00
reimar
33ca05bce9 Use a single malloc to allocate space for the circular buffers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28845 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 11:39:13 +00:00
reimar
1dd64224c4 Comment typo fixes for af_resample
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28844 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 11:31:18 +00:00
Uoti Urpala
66f6f9f076 Merge svn changes up to r28712 2009-02-23 21:00:52 +02:00
uau
45626ad18c af_stats: Some fixes to the new filter
The just committed af_stats was an older version of the patch with
broken max volume calculation. Fix that and do some cleanup.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28698 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 22:07:39 +00:00
diego
db757ae96b Add missing #include "config.h", fixes the warning:
libaf/af.c:23:5: warning: "HAVE_MALLOC_H" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28697 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 21:29:38 +00:00
diego
0cddea3754 Add statistics audio filter that prints information about the audio stream.
patch by Nicolas George, nicolas.george normalesup org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28696 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 21:27:27 +00:00
Uoti Urpala
186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego
be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:16:19 +00:00
Uoti Urpala
ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
diego
0c3d542dc7 WORDS_BIGENDIAN is defined/undefined, not 0/1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28374 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:56:27 +00:00
diego
65ea2d93f8 Drop HAVE_LRINTF check, lrintf is used without checking in other places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28372 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:54:14 +00:00
diego
eb4a4604c0 HAVE_3DNOW --> HAVE_AMD3DNOW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:29:53 +00:00
Uoti Urpala
03aa64687f Merge svn changes up to r28368
Fixes af_format.c compilation bug exposed by latest FFmpeg change.
2009-01-26 01:57:41 +02:00
diego
7034529d9a Fix build: Add required header and adjust preprocessor check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28368 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 23:55:21 +00:00
Uoti Urpala
dd888b05ff Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
	Makefile
	configure
	mplayer.c
2009-01-26 00:58:15 +02:00
diego
f66f0ca777 Add missing header for av_gcd, fixes the warning:
libaf/af_resample.c:204: warning: implicit declaration of function 'av_gcd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28357 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 19:20:30 +00:00
Uoti Urpala
79e1aa7cc7 Merge svn changes up to r28341
Conflicts:
	configure
	libmpcodecs/native/rtjpegn.c
2009-01-19 00:04:43 +02:00
cehoyos
83c523f9ea Fix compilation: s/ff_gcd/av_gcd.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-17 11:29:36 +00:00
reimar
97df2f9162 More #ifdef HAVE_MMX etc. missed by earlier search.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28327 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:32:54 +00:00
reimar
4abf191c5d More #ifdef -> #if fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28326 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:29:20 +00:00
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
diego
5043110082 Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and
libaf/af_format_ulaw.c --> libaf/af_format_ulaw.h.
Both files are not compiled but used as standard headers, so there
is no reason for them not be named like any other header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28273 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 22:05:19 +00:00
diego
92805de182 Use standard multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28272 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 21:55:47 +00:00
diego
1a42f9781f Remove unnecessary local definition of _ISOC9X_SOURCE.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28271 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 21:55:19 +00:00
diego
4f199a406b Remove obsolete and misleading comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28265 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 12:43:50 +00:00
diego
8198c5f15e Replace informal license notices by standard license header
and add standard license header where missing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28264 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 12:41:40 +00:00
diego
af6e5d6978 Fix two more instances of nonstandard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28262 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 11:06:28 +00:00
diego
eec12427d7 Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
a macro, not as a header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28236 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 16:13:22 +00:00
Uoti Urpala
cb3dc68691 Merge svn changes up to r28103 2008-12-06 02:16:51 +02:00
reimar
fa7614e9aa Add const to avoid warnings about discarded qualifiers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28091 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 14:21:22 +00:00
Uoti Urpala
8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
diego
4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:23:55 +00:00
ulion
78f37058ff Fix channel order for ffmpeg flac codec.
This patch comes from Andrew de Quincey <adq_dvb at lidskialf dot net>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27732 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 07:46:20 +00:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego
141e81cce4 Rename a bunch of miscellaneous preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
Uoti Urpala
2d4656e070 Merge svn changes up to r27332 2008-07-21 15:03:49 +03:00
reimar
24b14f8480 Make af_hrtf tables static const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27291 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 19:08:09 +00:00
reimar
7c78c34ace Add const to libaf/filter.c functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27290 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 19:05:42 +00:00
Uoti Urpala
af3fcdf2de Merge svn changes up to r27025
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
2008-06-07 19:57:57 +03:00
ulion
2e7dc8d9fb rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:57:36 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
2008-06-04 08:10:48 +03:00
diego
5423c418c2 cosmetics: Remove useless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:42:28 +00:00