Commit Graph

26283 Commits

Author SHA1 Message Date
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 b5ed673f32 Add necessary #includes to pass 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26163 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 23:35:24 +00:00
diego 2a9e515c77 Move duplicated extern declarations of mp_msg_levels and mp_msg_level_all
to cfg-common.h where they are really needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:45:36 +00:00
diego 622540e56f Remove pointless extern keyword from function declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26161 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:14:05 +00:00
diego 2c66b8ea24 #include parser-cfg.h instead of declaring m_config_parse_config_file extern.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26160 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:02:42 +00:00
diego 8375e840a5 Remove pointless extern keyword from function declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26159 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 20:58:25 +00:00
diego 3cd1f73f70 Add comments to #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26158 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:34:56 +00:00
diego 64ab68dc1d Simplify preprocessor conditionals: USE_LIBAV* is defined when compiling
against both shared and static libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:30:35 +00:00
diego ac491474f1 Remove pointless #ifdef USE_LIBAVCODEC inside #ifdef USE_LIBAVCODEC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26156 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:13:18 +00:00
nicodvb b867e95584 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26155 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 22:28:07 +00:00
diego db9f691b6c Remove ugly workaround for conflicting dca.h headers, it is no longer
necessary now that -I../libavcodec is not in CFLAGS anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:40:39 +00:00
diego f653e52663 Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.
Thus there is no need to use it everywhere.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:37:41 +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 4ba4e17b71 Remove unnecessary addition of -Ilibavformat to CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26151 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:31:38 +00:00
diego 5d2aa200e8 cosmetics: prettyprinting and alphabetical order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26150 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 18:15:35 +00:00
diego 98669ebdce Move decision about whether or not to compile Windows emulation
infrastructure to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26149 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 18:12:05 +00:00
diego e834773166 Move decision about whether or not to compile wrapper.S to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26148 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 17:51:36 +00:00
diego d47c6f5f32 Add CFLAG_STACKREALIGN unconditionally to win32.o CFLAGS, configure takes care
of setting it only when necessary anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26147 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 17:50:25 +00:00
gpoirier 66e747f5be replace all occurences of "M$" by "Microsoft" because it's what we really meant, and "M$" nickname is quite childish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26146 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 12:38:33 +00:00
diego 4ec85e8560 Add checkheaders target, ported from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26145 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:59:11 +00:00
diego bc2c5f3f6c Add ID_SEEKABLE information to -identify output.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26144 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:53:18 +00:00
diego 5e6231b340 #include osdep/mman.h if sys/mman.h is not available.
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26143 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:47:01 +00:00
uau 2e16b2826a configure: Set CONFIG_ENCODERS=yes in config.mak unconditionally
config.h already had "#define CONFIG_ENCODERS 1" unconditionally, but
the config.mak value depended on whether MEncoder was enabled.
Encoders need to be enabled as some encoder code is used by MPlayer
too. The inconsistent values broke compilation with --disable-mencoder
after libavcodec Makefile made compilation of i386/dsputilenc_mmx.o
depend on the config.mak value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26142 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 03:02:36 +00:00
diego a27f73390f Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26141 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-02 19:38:50 +00:00
reimar ae181c92fe Fix comment, qclp fourcc is Qclp not QCLP
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26140 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 20:09:22 +00:00
Gabrov 6ca48a6b2d synced with r26138
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26139 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 12:35:07 +00:00
diego 80104b1757 Fix illegal identifiers starting with _ and capital letters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:48:29 +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 7a5924159c Replace __MINGW32__ preprocessor check with proper HAVE_SYS_MMAN_H check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26136 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:16:43 +00:00
diego edf9dcba6b Remove va_start/vsnprintf workaround for OS/2.
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26135 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:50:06 +00:00
diego 2922e18092 Merge two #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:45:38 +00:00
diego a09376d67b cosmetics: reindent, detabify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:04:00 +00:00
diego 4485a60c38 Remove duplicate extern declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26132 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 08:56:28 +00:00
ben dfc775a923 fix bad function prototype
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26131 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 20:06:21 +00:00
ben b37e883a3d Remove now deprecated Savage VIDIX driver sources
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26130 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 20:04:03 +00:00
ben c6d4298b7b Use MPlayer consistent define naming convention for newly introduce
S3 registers header file.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26129 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 20:02:37 +00:00
ben 094daed554 New S3 VIDIX driver.
Provides support for S3 Trio and S3 Virge chipsets.
This deprecates the old Savage driver that worked with latest chips only.
(synchronized with vidix.sf.net r326 and r327)



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26128 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 20:01:28 +00:00
eugeni bb006c761a Add missing #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26127 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:44:54 +00:00
eugeni 36277e690e Support switching to/from nosound in demux_lavf.
Also fixes a bug when pstreams[-1] could be accessed. It happens when
switching audio tracks if mplayer was run with '-nosound'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26126 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:57 +00:00
eugeni 522ee6b783 Remove unused function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26125 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:55 +00:00
eugeni 0700038406 Reindent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26124 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:54 +00:00
eugeni 439cfd5d9e Don't select audio stream in lavf and mkv demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26123 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:52 +00:00
eugeni 22465e56cc Select audio stream in mplayer and mencoder, overriding demuxer decision.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26122 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:50 +00:00
eugeni 377d745ae9 Set audio->sh correctly when switching audio tracks. The same for video tracks.
Demuxers almost never update audio->sh or sub->sh when swithing tracks. It is
especially bad when switching to no sound, and results in "too many audio
packets" error.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26121 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:48 +00:00
eugeni c85a382afa Don't select subtitle track in lavf and mkv demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:47 +00:00
eugeni 96b0752265 Demuxer-independent subtitle track selection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26119 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:44 +00:00
eugeni 2c8e65329f Demuxer-independent functions for selecting tracks based on language.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26118 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:43 +00:00
eugeni 579e353b0f Remove stupid checks of free() argument.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26117 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:41 +00:00
eugeni a2fad60c7f Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
track language.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:39 +00:00
eugeni 18fea2aa49 Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
language when available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26115 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:37 +00:00