Commit Graph

55 Commits

Author SHA1 Message Date
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
Uoti Urpala 5099b1458d Merge svn changes up to r30683 2010-03-10 00:52:17 +02:00
Uoti Urpala b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02: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
reimar 1cf12c2492 Support more qscale types in most post-processing filters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30454 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-29 19:13:07 +00:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
reimar 7725c6d73b Make sure that a qstride of 0 (intentional or not) does not completely break
the code (crash if malloc(0) != NULL, otherwise wrong qscales used for B-frames).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30405 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 14:57:43 +00:00
Uoti Urpala a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
gpoirier 17eaff1a38 replace "g" asm constraint by "erm" since "g" allows 64bit immediates while
the operator (cmp) using the "g"-constrained operand doesn't support 64bit
immediates.
Original thread:
date: Tue, Jun 2, 2009 at 11:31 AM
subject: [PATCH] Fix MPlayer to compile on Darwin/x86_86


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29352 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-07 14:42:43 +00: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
diego b14c70b8f5 Use FFmpeg instead of MPlayer MANGLE macro, they are equivalent in this
particular case. Avoids the warning:
In file included from libmpcodecs/vf_fspp.c:693:
./mangle.h:34:1: warning: "MANGLE" redefined
In file included from libmpcodecs/vf_fspp.c:46:
./libavutil/internal.h:113:1: warning: this is the location of the previous definition


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28624 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 03:20:40 +00:00
diego 53067187b8 Move FFmpeg #includes below all others so that they do not override
system functions and cause the warning:
In file included from libmpcodecs/vf_fspp.c:57:
libmpcodecs/mp_image.h: In function 'new_mp_image':
libmpcodecs/mp_image.h:214: warning: implicit declaration of function 'please_use_av_malloc'
libmpcodecs/mp_image.h: In function 'free_mp_image':
libmpcodecs/mp_image.h:226: warning: implicit declaration of function 'please_use_av_free'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28623 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 03:15:10 +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 4ac4b493a9 Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28362 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 21:59:08 +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 4328410143 Do not use a global temps variable, this is ugly and does not compile with ICC.
Place them on the stack instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26084 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 11:39:35 +00:00
reimar 7738b457bc Get rid of pointless and confusing comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26082 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 11:19:55 +00:00
reimar 034bea46b9 mark constants as such
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25934 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 18:33:51 +00:00
reimar 54df8fcb9f Simplify: use DECLARE_ASM_CONST
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25933 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 18:31:45 +00:00
lorenm 06b0571bf9 fix artifacts in -vf fspp. regression in r23476.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25596 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 10:42:39 +00: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 c97e68b7b1 Add missing header file, fixes the warnings:
In file included from vf_fspp.c:46:
../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@25004 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-09 17:17:48 +00:00
diego f468804293 Remove commented-out and unused fmt_list array.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24894 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-30 15:27:13 +00:00
reimar 5d02058b47 Do not use fast_memcpy for small size copy, esp. when the size is constant
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 15:09:49 +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 e0ea1f7c69 count needs to be even
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21594 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-11 18:50:52 +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
diego b89020afc8 Replace asmalign.h hack by ASMALIGN cpp macros from config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19378 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 00:21:14 +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
nplourde a3713ceb29 add support for intel mac. mp3lib is not fixed yet.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18105 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-15 20:46:54 +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
henry 335f35f2bf reverse the H264 hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17226 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-19 18:04:37 +00:00
henry 1a84744160 negative quality values allow postproc regardless of input
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17224 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 18:11:26 +00:00
henry 7a80e5c844 do not postprocess H264
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17222 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 13:35:48 +00:00
henry cb6f72fd1a prevent flicker on b-frames, trivial port from vf_spp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17134 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 20:04:16 +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