1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 19:22:11 +00:00
Commit Graph

39 Commits

Author SHA1 Message Date
Uoti Urpala
009d9d8706 Adjust ffmpeg/libav #includes to work with recent upstream changes
The <libavutil/avutil.h> stopped including <libavutil/common.h>
recursively in recent ffmpeg/libav git revisions. As a result, some
files no longer got needed definitions, causing a build failure.
Modify #include lines in various files to fix build with the latest
versions of ffmpeg/libav headers.
2012-08-21 18:22:00 +02:00
Uoti Urpala
c33fafd6f1 Update libav API uses
Update various code to use newer alternatives instead of deprecated
functions/fields that are being dropped at libav API bump. An
exception is avcodec_thread_init() which is being dropped even though
it's still _necessary_ with fairly recent libav versions, so there's
no good alternative which would work with both those recent versions
and latest libavcodec. I think there are grounds to consider the drop
premature and revert it for now; if that doesn't happen I'll add a
version-test #if check around it later.
2011-04-20 04:36:05 +03:00
cboesch
fe3c4810e1 cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 13:11:20 +02:00
reimar
077c9025bf vf_geq: Fix function prototypes to match the required type.
Fixes "initialization from incompatible pointer type" warnings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31609 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:19 +02:00
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
iive
e16f02fe40 Fix build due to FFmpeg r22858 change (function rename).
Patch by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31033 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 20:03:26 +00: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
iive
e3ed371d51 Fix build due to FFmpeg r22833 change (typedef rename).
Found by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31029 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-11 13:47:13 +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
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
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
4c67136240 Remove misleading comment and remove unnecessary #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25003 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-09 16:28:37 +00:00
zuxy
4ba5898840 Remove unused static function get_image().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24799 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-17 14:06:44 +00:00
zuxy
f53d4bcb3e Reorder #includes to get rid of the FIXME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24766 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-12 03:17:43 +00:00
zuxy
c212ce53e6 Remove unnecessary #include <malloc.h>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24765 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-12 03:14:11 +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
reimar
13fa313b55 Remove useless fastmemcpy.h include for filters that do not even do any memcpy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23391 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-27 20:36:04 +00:00
diego
851b1e6351 Fix "inline keyword not at beginning of declaration" warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23237 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-05 12:45:32 +00:00
ods15
6355be18bd make vf_geq read whitespace in equation param
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20482 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:50:22 +00:00
ods15
bc9d65db85 remove unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20473 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 21:34:05 +00:00
ods15
6c1309fe19 cosmetic, reindentation, tab removal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20472 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 21:33:01 +00:00
ods15
591f6c68bb update vf_geq to new ff_eval API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 19:40:48 +00:00
michael
84aad40d58 bilinear interpolation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20276 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 20:21:31 +00:00
michael
c6fcd1fe5d 200 byte is too little
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20274 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 18:37:40 +00:00
michael
bc040ace6f generic equation filter
example: -vf 'geq=(p(X\,Y)+p(mod(Y*2-X*2\,W)\,mod(Y*2+X*2+sin((X-Y)/10/SW+N)*SW*20\,H)))/2'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20272 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 15:47:32 +00:00