RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 14:20:55 +00:00
Code Issues Releases Wiki Activity
32,378 Commits 41 Branches 0 Tags 164 MiB
69e3e06a1a
Commit Graph

38 Commits

Author SHA1 Message Date
Uoti Urpala
dde8b753e4 Merge svn changes r31318 to r31328 
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
 2010-06-05 23:35:42 +03:00
cehoyos
ef14d50ad6 Fix compilation after FFmpeg r23485. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-06-05 13:44:20 +00:00
Uoti Urpala
80be936a56 Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
cehoyos
d9396facdc Fix compilation after FFmpeg r23402. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-06-01 10:28:45 +00:00
Uoti Urpala
e74361c488 Merge svn changes up to r31189 2010-05-30 15:51:33 +03:00
Uoti Urpala
1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
 2010-05-29 17:20:44 +03:00
iive
31bc24b1d8 Fix compilation broken by FFmpeg-r23201 that changed the api of error logging. 
Also fix evaluation after FFmpeg-r23149 "change order of parameters".
Let the filters fail if evaluation can't be done.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31187 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-20 23:17:41 +00:00
Uoti Urpala
7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
diego
86ea8d4f4a Fix build after FFmpeg symbol rename: 
ff_eval2      --> ff_parse_and_eval_expr
ff_parse_eval --> ff_eval_expr
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31031 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-12 08:03:39 +00:00
Uoti Urpala
5099b1458d Merge svn changes up to r30683 2010-03-10 00:52:17 +02:00
diego
e0bc115b4d cosmetics: Rename struct vf_instance_s --> vf_instance. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 15:48:03 +00:00
diego
28cf6ea2be Rename open() vf initialization function to vf_open(). 
This avoids clashes with fcntl.h under certain circumstances.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30680 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 13:40:49 +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
d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03: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
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
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
b9509b1795 Remove unnecessary HAVE_AV_CONFIG_H #define. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27726 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-07 08:25:47 +00:00
Uoti Urpala
259ea9d703 Merge svn changes up to r27573 
Conflicts:
	libmpcodecs/vd_ffmpeg.c
 2008-09-10 23:59:08 +03:00
uau
923f67082e Fix compilation after libavcodec major version 52 changes 
Some symbols were dropped or renamed, requiring corresponding changes
in MPlayer.
 - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample.
 - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT.
 - Don't set AVCodecContext->rtp_mode (already marked unused before).
 - Use ff_eval2() instead of ff_eval().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-08 17:02:32 +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
47ef593617 Use standard license headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26759 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-13 10:16:20 +00:00
Uoti Urpala
05ad815133 Mark some constant symbols as such 2008-04-26 16:35:40 +03: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
reimar
b95c80ca86 Make all vf_info_t structs const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25249 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:57:15 +00:00
diego
8c2f371e19 Rearrange headers to get rid of an #undef and remove unnecessary headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25002 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-09 15:44:47 +00:00
diego
16ad1ac3be #include libavcodec/eval.h instead of manually declaring ff_eval. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25000 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-09 14:12:19 +00:00
cehoyos
0132ac3f9d printf in mp_image.h was changed to fprintf in r17972. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24040 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-08 23:28:29 +00:00
nicodvb
e23ef70156 removed unreachable code: this filter can't compile with external libavcodec (the Makefile rules prevent it) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18132 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-17 20:20:28 +00:00
michael
02b199e5e9 passing pts through the filter layer (lets see if pts or cola comes out at the end) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-21 21:26:42 +00:00
diego
872a28cc57 Move conditional compilation out of the code and into the build system. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-31 23:36:12 +00:00
diego
988281c471 Update licensing information: The FSF changed postal address. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17368 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-13 00:23:32 +00:00
diego
36e1974be0 Unify include path handling, -I.. is in CFLAGS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-11-18 14:39:25 +00:00
diego
b363ab3b19 Compilation fix for systems lacking lrintf like e.g. NetBSD. 
patch by Jan Knutar < jknutar -- at -- nic -- dot -- fi > and me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16678 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-10-05 09:39:08 +00:00
michael
14495f48ab #include dsputil.h as it contains the lrintf emu code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11924 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-02-05 22:03:42 +00:00
michael
9094281ecf qp change filter 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11922 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-02-05 15:56:05 +00:00