1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 10:02:17 +00:00
Commit Graph

302 Commits

Author SHA1 Message Date
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
Uoti Urpala
a41db36b22 Merge svn changes up to r26783
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
2008-05-15 21:19:35 +03:00
diego
0b4bfff65c Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26772 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 17:24:10 +00:00
Uoti Urpala
0e757bf9da Remove _s/_st suffix from some struct names
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
diego
5910188a5e Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26382 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-10 10:01:54 +00:00
diego
1e18468ce0 Remove useless #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26377 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:20:22 +00:00
diego
dc8d47d1eb Merge libaf/Makefile into Makefile, one less instance of recursive make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26376 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:15:21 +00:00
diego
f8b6baa57e Remove some useless quotes from #error preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:05:57 +00:00
diego
6ae33bc013 Use quotes instead of angular brackets for local includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26374 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:02:05 +00:00
diego
0ce6d08a83 Handle af_ladspa conditional compilation in the usual way.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:23:59 +00:00
diego
37ea342f85 #include config.h before all other headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-14 16:46:13 +00:00
diego
62ac9600ba Add missing header #include to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26214 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 19:19:03 +00:00
diego
d4ac911f0f af_export.c is only compiled if HAVE_SYS_MMAN_H is set, so using that
#ifdef within the file is pointless


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26213 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 19:12:29 +00:00
ulion
6b8b2a51e5 Fix ffvorbis decoder's output channel order with channel reordering function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 02:46:50 +00:00
diego
b355c3aa67 Add directory names to libavcodec #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26152 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:32:15 +00:00
diego
c03c4b5431 Wrap '#include <sys/mman.h>' in HAVE_SYS_MMAN_H.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26137 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:31:51 +00:00
diego
21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
diego
ae66c7536e Replace silly check for config.h inclusion, just include it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26096 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 23:44:35 +00:00
diego
8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego
c7577cd703 This header should not have multiple inclusion guards, it is meant
to be included multiple times.
patch by Alexander Stege  mplayer a legale-software d com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26026 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-18 21:07:33 +00:00
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
ulion
85941859b2 Fix buffer overflow bug by calculate the buffer size accurately.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25670 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 10:15:46 +00:00
diego
2b6af2000b Add multiple inclusion guards to all header files that lack them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 21:35:58 +00:00
diego
baee7815d5 Replace multiple inclusion guards with leading underscores by default names.
Leading underscores are reserved for system identifiers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25579 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:21:20 +00:00
diego
fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:15:50 +00:00
diego
496f7332a7 Relicense GPL v2 files as GPL v2+ and add proper license headers.
Done with permission from Michael Niedermayer, the author.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25557 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 10:41:20 +00:00
ulion
66abcc42af Add new audio filter for encoding multi-channel audio into ac3 at runtime.
And if set first parameter of this filter to 1, it will do ac3 passthrough
like hwac3 did.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25385 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-13 12:38:17 +00:00
ulion
1ed6e96cfb Fix all current known multi-channel wrong order problems by adding
common functions for channel reordering.
This fixes these modules by adding channel reordering code for 5.0/5.1 audio:
ao: pcm
ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm
ae: faac, lavc(ac3, libfaac), pcm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25343 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 16:53:30 +00:00
ulion
0fe9266445 Fix my wrong code in r25530.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25334 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 11:08:27 +00:00
ulion
920a892892 Fix missing command line bug by making the input parameter constant.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25330 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 01:43:33 +00:00
reimar
def649b0e4 100l, bzero is deprecated, use memset instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25216 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-30 21:29:45 +00:00
ivo
89308b1105 Remove redundant changelog from comments. There's always svn log.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25199 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-29 14:30:03 +00:00
diego
df58d5f00d Fix multiple inclusion guards, identifiers starting with __ are reserved
for the system.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25198 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-29 14:23:24 +00:00
ulion
70e7acda26 Prevent from using data->len when data is NULL (when play() return NULL).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25143 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 05:50:34 +00:00
reimar
ce11ba5de5 Add padding and unroll loop 4x for at least another 10% speedup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25104 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 22:13:49 +00:00