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