Commit Graph

94 Commits

Author SHA1 Message Date
Luca Abeni
a163ed1aaa Do not use a fake libavcodec/swscale.h, but always use the real one
(from libswscale) instead

Originally committed as revision 6777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 17:06:32 +00:00
Diego Biurrun
8dfcf67e88 spelling/grammar fixes
Originally committed as revision 6757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 12:12:44 +00:00
Diego Biurrun
89ae0e620d Add libswscale to the include path when enabled.
Originally committed as revision 6706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-16 10:21:41 +00:00
Diego Biurrun
8c9d49f266 Don't mix declarations and statements.
Originally committed as revision 6705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-16 10:20:33 +00:00
Víctor Paesa
a8824a790f simplifies null vhook by using sws_getCachedContext()
Patch by Victor Paesa %wzrlpy A arsystel P com%
Original thread:
Date: Sep 15, 2006 6:21 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 12:16:07 +00:00
Víctor Paesa
df117196d3 simplifies fish vhook by using sws_getCachedContext()
Patch by Victor Paesa %wzrlpy A arsystel P com%
Original thread:
Date: Sep 15, 2006 6:21 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 12:14:37 +00:00
Víctor Paesa
2d7490fcf4 port watermark vhook to swscaler
Patch by Victor Paesa %wzrlpy A arsystel P com%
Original thread + testcase:
Date: Sep 12, 2006 5:29 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 12:11:30 +00:00
Víctor Paesa
67d0436c8d port imlib2 vhook to swscaler
Patch by Victor Paesa %wzrlpy A arsystel P com%
Original thread + testcase:
Date: Sep 13, 2006 11:06 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 12:08:36 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Diego Biurrun
cbeee4d8e5 Replace -I../-I. by -I$(BUILD_ROOT).
Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 09:22:44 +00:00
Diego Biurrun
220d2d82ef make dep should also work.
Originally committed as revision 6540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 17:47:25 +00:00
Diego Biurrun
3263626feb Mark all phony targets as such.
Originally committed as revision 6538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 17:42:17 +00:00
Víctor Paesa
fbb9d1043d Fix vhook build on Cygwin, shared builds only.
patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 6247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-13 22:04:40 +00:00
Gustavo Sverzut Barbieri
aaf78bde93 fprintf/perror --> av_log
patch by Gustavo Sverzut Barbieri, barbieri gmail com

Originally committed as revision 6222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 17:54:14 +00:00
Diego Biurrun
ca373eb7e4 Add -g to LDFLAGS instead of adding it to the command line.
Originally committed as revision 6198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 17:18:46 +00:00
Diego Biurrun
3c57374894 LDFLAGS_$@ contains libs, not LDFLAGS, rename it accordingly.
Originally committed as revision 6193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-07 23:06:14 +00:00
Diego Biurrun
529dd3c9ea Move required libs after the object file for the shared lib compilation.
Fixes Cygwin build as reported by Victor Paesa.

Originally committed as revision 6192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-07 23:04:26 +00:00
Gustavo Sverzut Barbieri
b2565d710f Introduce a mechanism to add object-specific linker flags.
patch by Gustavo Sverzut Barbieri, barbieri gmail com

Originally committed as revision 6182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-07 00:06:48 +00:00
Víctor Paesa
a4dd5fb73a port ppm vhook to swscaler
patch by Victor Paesa % wzrlpy A arsystel P com %
Original thread:
Date: Sep 2, 2006 11:41 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-03 19:25:06 +00:00
Víctor Paesa
dd93315340 Re-Add support for PNG or PNM as watermark images, which was broken
since the move to image2 API
Patch by Victor Paesa <wzrlpy@arsystel.com>
Original thread:
Date: Aug 13, 2006 9:18 AM
Subject: [Ffmpeg-devel] [PATCH] Attempt image2 in watermark vhook

Originally committed as revision 6129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-30 14:11:27 +00:00
Guillaume Poirier
809b6a3138 Use libswscale in fish vhook.
Patch by
Victor Paesa <wzrlpy@arsystel.com>
Original thread:
Date: Aug 30, 2006 1:16 AM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-30 12:01:22 +00:00
Víctor Paesa
be484a2cc9 convert null vhook to libswscale
Patch by Victor Paesa % wzrlpy A arsystel Pcom %
Original thread:
Date: Aug 23, 2006 7:28 PM
Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale

Originally committed as revision 6114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-28 11:57:19 +00:00
Michael Niedermayer
b4902c11c1 av_free* cleanup
Originally committed as revision 6019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-18 08:05:24 +00:00
Diego Biurrun
7981555d89 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.

Originally committed as revision 6016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 16:32:08 +00:00
Diego Biurrun
041514a422 Revert last commit, VPATH is necessary for out-of-tree builds.
Originally committed as revision 6014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 16:28:47 +00:00
Diego Biurrun
cf41e66736 Remove unnecessary include and variable declaration.
Originally committed as revision 6013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 16:02:57 +00:00
Diego Biurrun
408382a434 Make vhook CFLAGS handling less confusing.
Originally committed as revision 6012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 15:55:19 +00:00
Diego Biurrun
84c22efdfb Create infrastructure to install shared and static libs into different places.
based on patch by Víctor Paesa wzrlpy at arsystel com

Originally committed as revision 5755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-15 23:01:52 +00:00
Diego Biurrun
3409385da6 Properly handle vhook build flags for platforms that require special handling.
Removes one of the last FIXMEs from the build system.

Originally committed as revision 5745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-14 16:18:59 +00:00
Diego Biurrun
302cdccfc1 cosmetics: Reorder some entries for more consistency and readability.
Originally committed as revision 5744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-14 15:30:36 +00:00
Diego Biurrun
f130fd4630 cosmetics: Break overly long lines.
Originally committed as revision 5622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05 14:12:00 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Ville Skyttä
22a0e90712 Support modular X11 path to rgb.txt patch by (Ville Skyttä - scop from SF-bugtracker)
Originally committed as revision 5429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-30 09:21:58 +00:00
Diego Biurrun
f9edb71744 uninstallation support
inspired by a patch from Richard, richiek.,@,.optushome.,.,.com.,.,.au

Originally committed as revision 5398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 12:14:02 +00:00
Diego Biurrun
a11d5f50ac Simplify vhook build.
Originally committed as revision 5397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 09:02:05 +00:00
Måns Rullgård
a11a334d18 make install target depend on vhooks
Originally committed as revision 5213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 20:34:00 +00:00
Marcus Engene
ed818e25f8 Watermarking with exact colors.
Patch by Marcus Engene <hisfirstname(at)hislastname.se>

Originally committed as revision 5131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-09 14:39:29 +00:00
Dieter
efce1a8fea add static keyword to some functions
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-30 23:41:27 +00:00
Dieter
ceaf1909c1 add static keyword to some functions
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-30 23:33:19 +00:00
Dieter
a851b8e898 add missing #includes
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-30 23:32:14 +00:00
Diego Biurrun
04c07634d6 Remove obscure Makefile.bak entry from distclean rules.
Originally committed as revision 4901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-26 23:42:30 +00:00
Diego Biurrun
98013cc16c Make clean/distclean consistent throughout all the Makefiles.
Originally committed as revision 4863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-16 14:59:54 +00:00
Diego Biurrun
29a10be0d4 Don't use 'rm -f *$(SLIBSUF)' in a clean rule, $(SLIBSUF) might be empty.
Remove all possible shared libs suffixes instead.

Originally committed as revision 4860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-15 00:28:36 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
fb3d46da69 Move Darwin shared library build peculiarities to configure.
Originally committed as revision 4838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 00:00:00 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
Marcus Engene
f368375cef FreeBSD support as well as some assorted fixes
patch by the author, Marcus Engene < ffmpeg __ at __ engene __ dot __ se >

Originally committed as revision 4665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-26 20:16:57 +00:00
Patrice Bensoussan
3702300cbb Fix linking failure on Mac OS X <10.4.
patch by Patrice Bensoussan patrice = dot = bensoussan = at = gmail = . = com

Originally committed as revision 4657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-22 19:10:14 +00:00