Uoti Urpala
497c32cdad
Merge svn changes up to r31291
2010-06-02 18:55:18 +03:00
diego
def243261a
Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 22:14:13 +00:00
Uoti Urpala
4c6e3ac01b
Merge svn change r31134
...
Fix some search/replace errors introduced in the svn commit.
2010-05-07 22:03:48 +03:00
diego
a535f7bfca
the great MPlayer tab removal: part II
...
some extra indentation fixes are put in as a bonus
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
Uoti Urpala
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
diego
75fad5bac6
Mark encoder-related m_option_t struct arrays as const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:59:09 +00:00
diego
ff93cd656b
Add a header for x264enc_set_param() instead of forward declaring it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
Uoti Urpala
c37f09693d
Merge svn changes up to r30643
2010-03-10 00:00:06 +02:00
Uoti Urpala
12d3caebc7
Merge svn changes up to r30475
2010-03-09 19:18:43 +02:00
diego
352dfc79e4
Remove forward declarations for non-existing functions readPPOpt, revertPPOpt.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30634 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 09:41:52 +00:00
diego
99c1bbca2a
Add license header to all top-level files missing them.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
Uoti Urpala
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +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
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
8c5889004f
Restore two mistakenly removed 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28087 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:43:58 +00: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
6cce822505
Merge svn changes up to r27399
...
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
2008-08-02 22:04:35 +03:00
diego
96a506733d
Change a bunch of codec-specific preprocessor directives from a HAVE_
...
prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 16:30:32 +00:00
diego
ba58bf37d6
Remove checks for HAVE_XVID3, that conditional was removed a long time ago.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27394 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 13:59:47 +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
529d106627
Silence "discards qualifiers" warnings when compiling mplayer.c
...
Add casts to subconfig entries in option lists to avoid the excessive
amount of "initialization discards qualifiers from pointer target
type" warnings. Also add const to the type of mpctx_get_audio_out to
eliminate a warning and make it match the type in the header (svn
r25793 had added a const to the header but not mplayer.c). Make
libmenu_vfs a table of pointers to const to eliminate another warning
plus make the table itself const.
2008-04-26 11:03:12 +03:00
diego
4bec934234
Split cfg-common.h into two separate header files. It was being included twice
...
with different definitions set that activated either the lower or the upper
half of the header. The effectively simulated using two different header files.
It is more straightforward to split the header instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26392 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 09:48:36 +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
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
reimar
c1a683ad8c
Change force_fps and force_ofps to double
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:50:34 +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
reimar
37235a01d9
Make the main m_option_t arrays const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25261 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:45:34 +00:00
reimar
1bf629e38e
Move fakemono extern to cfg-common.h where it is actually used.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25259 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:10:56 +00:00
reimar
54016c6776
Remove pointless ifdefs around extern declarations
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25258 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:08:07 +00:00
diego
c9232c4a62
Make liblzo conditional to the appropriate #defines.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 19:28:47 +00:00
diego
2d8010498d
Clarify messages for unavailable options.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20917 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 11:14:03 +00:00
lorenm
11a8049263
make any parse error in -x264encopts fatal
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:19:29 +00:00
lorenm
34a5cd1be8
fix multiple instances of -x264encopts on the commandline (broke in r20060)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 23:11:36 +00:00
lorenm
0594cd07a0
Remove the x264 option parser, and pass the options on to libx264 as a string instead. This provides automatic support for all current and future x264 options.
...
A few options had to be reorganized: partitions, deblockalpha/beta, me, direct_pred.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20060 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 02:03:10 +00:00
ptt
928da7a448
after a long time, finally i could add -endpos option to mplayer executable.
...
as oded told me on 1006 02 24, i applied it, blame me if some problem occurs,
i hope not, since i tried it for a while....
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 16:47:56 +00:00
diego
f89a7da604
Remove support for obsolete and non-free divx4/odivx libraries.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-14 17:14:16 +00:00
gpoirier
19fd398418
fix vfw-related things, patches by RC and Compn
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18434 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-11 05:51:26 +00:00
uau
8f30963c37
Make EDL compilation unconditional
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 12:40:29 +00:00
corey
89d848a8a2
dwStart support for mencoder.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 09:34:37 +00:00
nicodvb
ad978de549
added support for external libavformat
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-09 19:35:44 +00:00
diego
64f4a3f32f
Remove duplicate leftover line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16982 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-12 22:02:17 +00:00
diego
f802240b8f
A long-standing bug... -vfwopts in cfg-mencoder.h is being overridden
...
by -vf* in cfg-common.h. The easiest fix of all, add an 'x' to the
name: -xvfwopts
patch by RC <rcooley -- at -- spamcop -- dot -- net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16618 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-28 21:49:40 +00:00
ods15
591fadadfd
Make frameno.avi not turn on by default. this is deprecated and this entire
...
feature should be removed anyway. manpage update in a bit...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16529 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 19:23:38 +00:00
ods15
0383e89616
-delay for MEncoder, step 1.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15993 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:25:33 +00:00
ranma
a123c6be4c
Check for WAVEFORMAT.wFormatTag overflows and allow user to override the tag with -fafmttag
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15889 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-02 19:00:13 +00:00
ranma
6ca9795767
rawaudio muxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15755 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-19 09:12:44 +00:00
diego
ab9eeeed25
Surround lavf in the '-of help' output by #ifdef USE_LIBAVFORMAT.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15542 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-21 18:19:13 +00:00
diego
f6c5a0788c
Document lavf muxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15533 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-20 23:22:54 +00:00