1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

135 Commits

Author SHA1 Message Date
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
Steven M. Schultz
495d6cdcfd vhoook vs vhook typo, patch by Steven M. Schultz < sms - at - 2BSD - at - COM >
Originally committed as revision 4624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-01 14:21:34 +00:00
Diego Biurrun
4e159595b5 support for building dynamic libraries on Mac OS X
based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org>

Originally committed as revision 4616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-26 10:05:13 +00:00
Alexander Strasser
c11c2bc20b libavutil: Utility code from libavcodec moved to a separate library.
Originally committed as revision 4489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-01 20:07:05 +00:00
Mike Melanson
a2cfc4d630 this file got skipped during the API update
Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-18 16:43:14 +00:00
Niki W. Waibel
56b04ceb47 compiling using nonstd include/library locations / add LDFLAGS to a few places patch by (Niki W. Waibel - nikiwaibel)
Originally committed as revision 4429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-11 00:15:37 +00:00
Marcus Engene
ded78ac086 vhook watermark patch by (Marcus Engene: ffmpeg, engene se)
Originally committed as revision 4309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 09:18:38 +00:00
Michael Niedermayer
efe419837f cast NULL to correct type
Originally committed as revision 4210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-10 08:53:07 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Luca Barbato
cc973ecbe7 add libdir support to configure patch by (Luca Barbato )lu_zero gentoo org)
Originally committed as revision 4050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-16 19:11:58 +00:00
Michael Niedermayer
21754ce65c watermark filter by (Marcus Engene <ffmpeg engene se>)
Originally committed as revision 3983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-25 22:22:20 +00:00
François Revol
cf344ec72c get fish to compile (time() forbidden), pstrcat not declared from ppm.c
Originally committed as revision 3978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 22:07:10 +00:00
Michael Niedermayer
1f3f950799 disallow strcat
Originally committed as revision 3826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 01:44:02 +00:00
Michael Niedermayer
813af36b51 sprintf->snprintf
Originally committed as revision 3824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 01:02:13 +00:00
Michael Niedermayer
bb4a87727b imlib2 vhook rgba fix by ("Todd.Kirby" <doubleshot at pacbell dot net>)
Originally committed as revision 3498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-23 10:33:42 +00:00
Michael Niedermayer
aa99b8ff4f spaces in the patch fix by (Nicolas Boos <nicolas.boos at wanadoo dot fr>)
Originally committed as revision 3296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-08 11:02:04 +00:00
Alex Beregszaszi
00a3c8b8a9 fix compilation after michaels anti-time change
Originally committed as revision 2977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 13:31:27 +00:00
Michael Niedermayer
75388c749b 2nd attempt at OS/X shared/mdynamicnopic fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
Originally committed as revision 2475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 20:04:10 +00:00
Dan Christiansen
cf9d24adf6 - Moving -Wall from the individual Makefiles to configure (and only
have it passed to GCC)
- Moving the usage in configure to the top of it, so you don't have to
wait needlessly
- Silence compiler output during configuration
- Add support for configuring with IBM XLC

patch by (Dan Christiansen <danchr at daimi dot au dot dk>)

Originally committed as revision 2397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-18 18:47:06 +00:00
Dan Christiansen
fe0f2a9719 PowerPC warnings & optimisations patch by (Dan Christiansen <danchr at daimi dot au dot dk>)
Originally committed as revision 2315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-28 22:53:25 +00:00
Charles Yates
1e4ddde2ad ppm vhook follow up patch by (Charles Yates <charles dot yates at pandora dot be>)
mostly tab -> space cosmetics

Originally committed as revision 2313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-28 20:58:57 +00:00
Glenn Maynard
cddf3f452a Debug/optimization patch by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 19:03:14 +00:00
Charles Yates
bee0d9e587 vhook patch by (Charles Yates <charles dot yates at pandora dot be>)
Originally committed as revision 2201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-03 14:20:33 +00:00
Philip Gladstone
25a2ee7dd6 Get all the stride stuff right so that we actually get the colours
right.

Originally committed as revision 1944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-10 01:47:41 +00:00
Philip Gladstone
d9974a4867 Made it work again -- it now detects fish! (This involved clearing out
some accumulated bit rot)

Originally committed as revision 1895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-21 02:15:11 +00:00
Philip Gladstone
0a6de063b0 Updated with many new features.
Originally committed as revision 1587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-16 22:49:52 +00:00
Zdenek Kabelac
244b86134b * int64_t is now the right name
- also it would be nice to preserve ffmpeg coding rules

Originally committed as revision 1582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-12 07:28:01 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Philip Gladstone
df4f91471c Initial checkin for a cheaper text drawing function than imlib2.c.
Originally committed as revision 1577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 04:01:55 +00:00
Philip Gladstone
b90a6beb8a Add Makefile entry for the drawtext filter
Originally committed as revision 1576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 04:01:07 +00:00
Philip Gladstone
4be3147d0d prevent segfault when passed no arguments
Originally committed as revision 1558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-09 00:11:42 +00:00
Fabrice Bellard
91d742b746 fixed dependencies
Originally committed as revision 1530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-01 20:56:39 +00:00
Fabrice Bellard
e9a9e0c210 use av_strdup()
Originally committed as revision 1507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-23 23:34:29 +00:00
Fabrice Bellard
4b8b2edb62 dependency handling is consistant with libavcodec
Originally committed as revision 1492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-22 09:55:08 +00:00
Fabrice Bellard
811e6d731f removed unused rule
Originally committed as revision 1491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-22 09:53:50 +00:00
Fabrice Bellard
7c235fe238 dependency handling is consistant with libavcodec
Originally committed as revision 1490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-22 09:53:25 +00:00
Fabrice Bellard
0e5f8ab165 fixed imlib2.c pixel format (imlib2 seems to use CPU endianness in RGBA32 as libavcodec)
Originally committed as revision 1471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-19 15:40:06 +00:00
Philip Gladstone
77b71ddc11 AUtomatic dependency generation. Runs on Linux (at least). Probably should
update .cvsignore (somehere) to exclude .d files

Originally committed as revision 1459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-14 15:30:42 +00:00
Philip Gladstone
6c11d48cab Added a release function to free up the context. Also removed the dummy
declarations at the bottom of the file. This type checking is now handled by the
header file.

Originally committed as revision 1295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-30 17:17:58 +00:00
Philip Gladstone
9d6f1d52c5 Moved hook documentation into the doc directory
Originally committed as revision 1292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-30 17:12:23 +00:00
Fabrice Bellard
a382b927ed fixed multidir compile
Originally committed as revision 1289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-29 14:56:03 +00:00
Philip Gladstone
b55e4ef43d Try to get this to build on more platforms (especially Darwin)
Originally committed as revision 1278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-26 03:35:18 +00:00
Fabrice Bellard
abac617591 renamed libav to libavformat
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-25 19:07:40 +00:00
Philip Gladstone
47930f093e Applied changes to make it compile on darwin
Originally committed as revision 1270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-23 01:29:25 +00:00
Philip Gladstone
26b4bb70c2 Added three sample video hooks. See the (rudimentary) documentation on what
they do and their capabilities.

Originally committed as revision 1265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-21 03:50:36 +00:00