1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-31 15:59:34 +00:00
Commit Graph

57 Commits

Author SHA1 Message Date
Uoti Urpala
d1a54d5696 Remove unnecessary libavutil/internal.h includes
These includes were added earlier after the definition of the
DECLARE_ALIGNED and DECLARE_ASM_CONST macros were moved to this
header in FFmpeg. However now those macros are again in the public
mem.h header, and there is no need to include internal.h.
2009-07-26 06:15:19 +03:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03: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
dd888b05ff Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
	Makefile
	configure
	mplayer.c
2009-01-26 00:58:15 +02:00
diego
4a0bcc1319 Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28364 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 22:34:26 +00:00
Uoti Urpala
79e1aa7cc7 Merge svn changes up to r28341
Conflicts:
	configure
	libmpcodecs/native/rtjpegn.c
2009-01-19 00:04:43 +02:00
reimar
93d598c7b2 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
and #ifdef HAVE_MMX etc -> #if HAVE_MMX.
There might be still more that need to be fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:21:21 +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
6b52a2e974 Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:59:27 +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
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
be69c6d145 Add missing header files, fixes the warnings:
In file included from vf_mcdeint.c:59:
../libavcodec/dsputil.h: In function 'copy_block2':
../libavcodec/dsputil.h:675: warning: implicit declaration of function 'AV_WN16'
../libavcodec/dsputil.h:675: warning: implicit declaration of function 'AV_RN16'
../libavcodec/dsputil.h: In function 'copy_block4':
../libavcodec/dsputil.h:686: warning: implicit declaration of function 'AV_WN32'
../libavcodec/dsputil.h:686: warning: implicit declaration of function 'AV_RN32'
In file included from vf_spp.c:40:
../libavcodec/dsputil.h: In function 'copy_block2':
../libavcodec/dsputil.h:675: warning: implicit declaration of function 'AV_WN16'
../libavcodec/dsputil.h:675: warning: implicit declaration of function 'AV_RN16'
../libavcodec/dsputil.h: In function 'copy_block4':
../libavcodec/dsputil.h:686: warning: implicit declaration of function 'AV_WN32'
../libavcodec/dsputil.h:686: warning: implicit declaration of function 'AV_RN32'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25005 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-09 17:20:27 +00:00
diego
80e1a70e8a Remove unused fmt_list array, fixes the warnings:
vf_ow.c:296: warning: 'fmt_list' defined but not used
vf_spp.c:544: warning: 'fmt_list' defined but not used
vf_uspp.c:334: warning: 'fmt_list' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24893 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-30 15:24:09 +00:00
diego
04586de1dd MPEG-2 blocks at qp 1 get overfiltered by spp, apparently because "qp>>1" turns
it into 0, which causes an integer overflow later. Clip qp at 1 to avoid this.
patch by Alexander Strange, astrange ithinksw com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24572 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-18 14:08:08 +00:00
reimar
6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
henry
1c714fb0ca qp height should be in macroblocks, not pixels
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20601 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 19:52:42 +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
michael
2c5c0cea5f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17111 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 11:17:26 +00:00
michael
7e0339dd16 attribute align
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17083 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-03 03:37:43 +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
iive
d641bf0337 use stored dimensions instead of visible one when (vf_)get_image is called
let's see where does the cola goes :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16019 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-20 01:22:24 +00:00
michael
3784f7a494 ensure that dr buffers are readable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15966 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-11 18:48:09 +00:00
syrjala
c260a1139d Improved NV12/NV21 support.
- Fixed PlanarToNV12Wrapper() and made it handle NV21.
- Added yuv2nv12XinC() to handle software scaling.
- Added NV12/NV21 handling to various places.
- Removed NV12 from vf_hue and vf_spp as they don't look like they can
  actually handle it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14716 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-16 23:47:00 +00:00
michael
9ec7ec7475 removing strange csp matching code (was copy&pasted from vf_pp where it originated from arpi 2.5 years ago) -> fixes spp+scale+x11 crash
dont disable the filter by default (100l for iive)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14023 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-23 21:21:54 +00:00
reimar
a3fe03568b crash with Y8 colourspace fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13730 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-21 16:47:42 +00:00
aurel
798d2d1337 adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13721 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-21 11:55:20 +00:00
michael
3d8456a962 100l typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13394 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-19 22:15:57 +00:00
michael
80fa17368d 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13150 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-26 10:12:14 +00:00
iive
310d9a47c1 Fix memory corruption, noticable at reallocate image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12632 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-24 12:01:53 +00:00
iive
c6df54c835 quant_parameter is 2*mpeg1_quant, no problems noticed with too high values
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12164 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-09 22:58:41 +00:00
iive
eadf84b7d8 check for invalid user input
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12158 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-08 12:03:24 +00:00
michael
52f9770899 spp softthresholding in mmx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11995 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-24 13:28:42 +00:00
michael
694395d7bf spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11994 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-24 11:23:27 +00:00
alex
264f4670a1 Fix compilation if lavc is compiled as a shared lib. Patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11569 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-07 15:30:25 +00:00
michael
47f136d976 memcpy pix instead of black screen if no DR and codec provides no qscale table
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11478 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-16 10:48:03 +00:00
michael
98775f442b 1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11336 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-31 13:23:33 +00:00
michael
26f88f7246 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11335 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-31 12:59:51 +00:00
michael
09c8f3f996 skip filter if codec doesnt provide the QP array and user didnt force a QP (fixes diegos segfault)
its quite scary how many 10l bugs the spp filter had ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11309 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 20:49:33 +00:00
michael
9961263e78 autoq
support all planar YUV variants (untested, probably buggy)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11308 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 14:00:07 +00:00
michael
c74d0504cc 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11306 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 13:17:11 +00:00
michael
222baf576e another 10l ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11305 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 12:41:19 +00:00
michael
b2e9e05254 optimize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11302 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 10:45:55 +00:00