virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
13,137 Commits 39 Branches 425 Tags
9bcc2883ac3b3d1f5938db12cba64211b57a7c21
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Biurrun 9bcc2883ac bandaid fix for broken shared library installation 
Originally committed as revision 12617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 03:13:21 +00:00
Diego Biurrun dfd1083831 Move INSTALL_PROGS_TARGETS variable to a better place. 
Originally committed as revision 12616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 03:07:55 +00:00
Diego Biurrun 88ad036874 Handle EXTRALIBS and LDFLAGS for libswscale and libavfilter in a simpler way. 
Originally committed as revision 12615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 02:45:09 +00:00
Diego Biurrun c1ac39b3df Replace ifeq to declare install-progs dependencies by a variable. 
Originally committed as revision 12613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 01:58:53 +00:00
Diego Biurrun a7319cc22a The install target should depend on enabled installation targets. 
Originally committed as revision 12612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 01:49:01 +00:00
Diego Biurrun 7b3ca33fb6 Fix circular dependency between install-progs and install-libs targets. 
Originally committed as revision 12611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 01:40:49 +00:00
Diego Biurrun e58cc8e604 Remove TAGS target. It is ages old and has never been updated to match 
changes to the source tree. Thus it has to be completely unused.

Originally committed as revision 12610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 00:59:55 +00:00
Diego Biurrun e9c192562f Move CPU detection code after OS-specific settings and logging system 
initialization so that we can use compilation checks inside it.

Originally committed as revision 12602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 11:33:21 +00:00
Diego Biurrun 7716f7ffa3 Use common.mak in the top-level Makefile as well. 
Originally committed as revision 12599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-26 09:39:12 +00:00
Diego Biurrun 916dafd57c cosmetics: Rename SRCS variable to PROGS_SRCS. 
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-26 09:30:09 +00:00
Diego Biurrun f4428f9992 Merge LDFLAGS lines. 
Originally committed as revision 12597 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-26 09:27:58 +00:00
Diego Biurrun 2721715985 cosmetics: Move around some rules and variable declarations. 
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-26 09:22:43 +00:00
Diego Biurrun 92e791ff37 cosmetics: Rename 'all' target to 'main'. 
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12595 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-26 08:58:26 +00:00
Diego Biurrun bfffdb81c2 Classify mlib as a configurable option, not as a hardware feature. 
Originally committed as revision 26275 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-25 21:30:46 +00:00
Diego Biurrun a815037409 Classify mlib as a configurable option, not as a hardware feature. 
Originally committed as revision 12589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 21:30:16 +00:00
Diego Biurrun 5ce265a1de Rename --enable-sunmlib option to --enable-mlib. 
Allows handling the option in a more standard way.

Originally committed as revision 12588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:24:41 +00:00
Diego Biurrun 4f854758f7 cosmetics: Rename targetos variable to target_os. 
Originally committed as revision 12587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:17:47 +00:00
Diego Biurrun db6107b68f Rename --cross-compile option to --enable-cross-compile. 
Allows handling the option in a more standard fashion.

Originally committed as revision 12586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:16:02 +00:00
Diego Biurrun e155a21ad7 Invert logging variable logic so that it works without setting a default. 
Originally committed as revision 12585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:10:26 +00:00
Diego Biurrun f2310b793d --log=no is now --disable-logging. 
Originally committed as revision 12584 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:08:14 +00:00
Diego Biurrun 530dc5387d cosmetics: alphabetical order 
Originally committed as revision 12583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:04:42 +00:00
Diego Biurrun 87a0fb627b Rename --disable-strip option to --disable-stripping. This allows 
handling this option in a more standard way.

Originally committed as revision 12582 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 15:00:57 +00:00
Diego Biurrun cb6b4c98d2 cosmetics: indentation 
Originally committed as revision 12578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 09:54:38 +00:00
Diego Biurrun 8c6afa4dae Introduce --disable-logging option to control logging. --logfile now just 
controls the name of the log file, not the decision whether or not to log.

Originally committed as revision 12577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 09:53:49 +00:00
Diego Biurrun a77705e2b6 Rename --log option to --logfile. 
Originally committed as revision 12576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 09:51:59 +00:00
Diego Biurrun d314ea4e40 Remove ineffectual --log option. 
Originally committed as revision 12575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 09:33:26 +00:00
Diego Biurrun 399d31cce8 Add OS-specific executable suffix to temporary executable name. 
Originally committed as revision 12574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 09:24:55 +00:00
Diego Biurrun 0f53b19228 Move declaration of temporary filenames after the OS-specific settings 
so that things like executable suffix can be picked up.

Originally committed as revision 12573 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-25 09:22:03 +00:00
Diego Biurrun 0e58bf670d Remove #ifdef HAVE_SYS_MMAN_H around sys/mman.h #include. 
Without the #include compilation fails.

Originally committed as revision 12568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-24 10:54:01 +00:00
Diego Biurrun 362b3bf757 Remove unneeded sys/mman.h #include. 
Originally committed as revision 12567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-24 10:50:16 +00:00
Diego Biurrun 2f7707017e cosmetics: prettyprinting 
Originally committed as revision 12566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-23 16:01:13 +00:00
Diego Biurrun aa089f6c05 typo fixes: tempBlured --> tempBlurred 
Originally committed as revision 12557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 17:36:31 +00:00
Diego Biurrun 4cf16bbed5 cosmetics: comment typo fixes 
Originally committed as revision 26269 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-22 17:35:32 +00:00
Diego Biurrun 170c0b455c Fix typo in variable name: blured --> blurred. 
Originally committed as revision 12556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 17:34:29 +00:00
Diego Biurrun 04932b0d97 cosmetics: typo fixes 
Originally committed as revision 12554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 16:46:36 +00:00
Diego Biurrun a94948d327 cosmetics: Fix typo in variable name, numSkiped --> numSkipped. 
Originally committed as revision 12553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 16:43:07 +00:00
Diego Biurrun 16e0bf7349 cosmetics: Fix indentation to be 4 spaces and consistently place {}. 
Originally committed as revision 12552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 15:46:34 +00:00
Diego Biurrun 5341d85601 Include files are now installed in $PREFIX/include. 
Originally committed as revision 12550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 13:19:23 +00:00
Diego Biurrun d952638699 typo: occured --> occurred 
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 01:06:57 +00:00
Diego Biurrun 77ab59eb7f two more typos spotted by Mike 
Originally committed as revision 12524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 19:36:20 +00:00
Diego Biurrun c2f178da71 british_english--; 
Originally committed as revision 12522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 19:08:42 +00:00
Diego Biurrun b00675499c Only #include sys/mman.h if configure set HAVE_SYS_MMAN_H. 
Originally committed as revision 12521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 19:07:24 +00:00
Diego Biurrun c5fec7d76c Remove redundant ARCH_POWERPC #ifdef around HAVE_ALTIVEC. 
Originally committed as revision 26264 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-18 22:14:57 +00:00
Diego Biurrun 0866c56f0a Remove redundant ARCH_POWERPC #ifdef around HAVE_ALTIVEC. 
Originally committed as revision 12495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 22:14:41 +00:00
Diego Biurrun 6fce759141 Fix previously broken x86_64 check, simplifying it in the process. 
Originally committed as revision 12475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:43:32 +00:00
Diego Biurrun 3dddba4b5d Fix previously broken xlc checks, simplifying them in the process. 
Originally committed as revision 12474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:40:42 +00:00
Diego Biurrun 78fe7631f8 Drop unnecessary subshell invocation from BEINCLUDES check. 
Originally committed as revision 12473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:36:44 +00:00
Diego Biurrun 08e89160e4 cosmetics: indentation 
Originally committed as revision 12471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:22:39 +00:00
Diego Biurrun edfd6975cf Simplify MANGLE macro preprocessor condition checks. 
Originally committed as revision 12470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:22:11 +00:00
Diego Biurrun 7edd384f1d Add -q to grep invocation where appropriate. 
Originally committed as revision 12469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:20:42 +00:00
Diego Biurrun b0605329c9 Move functions that are only used when libswscale is not compiled in below 
the appropriate #ifdef. This avoids a bunch of "defined but not used" warnings
when compiling with libswscale enabled.

Originally committed as revision 12463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 17:34:31 +00:00
Diego Biurrun abe39c0f31 Escape \1 and \2 in sed expressions written to config.mak to avoid mangling. 
Originally committed as revision 12462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 15:51:47 +00:00
Diego Biurrun 08c4e395d2 Return of the living typo II: VHOOKDEPEND_CMD --> VHOOK_DEPEND_CMD 
Originally committed as revision 12461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 15:27:18 +00:00
Diego Biurrun 6a5b97732e 10l: Fix stupid typo, VHOOKDEPEND_CMD --> VHOOK_DEPEND_CMD. 
Originally committed as revision 12456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 11:24:22 +00:00
Diego Biurrun b1b184812c Merge binary generation rules. 
Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 19:57:09 +00:00
Diego Biurrun e6a383d695 Use $< to simplify a few lines. 
Originally committed as revision 12451 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 19:14:07 +00:00
Diego Biurrun 63d026b1bf cosmetics: #include config.h before all other FFmpeg headers. 
Originally committed as revision 12450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 16:17:02 +00:00
Diego Biurrun bd10713636 typo fixes 
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 16:15:47 +00:00
Diego Biurrun bee972eead typo 
Originally committed as revision 26251 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-15 16:13:24 +00:00
Diego Biurrun 4477b9f424 Properly check for AltiVec CFLAGS instead of guessing based on compiler vendor. 
Originally committed as revision 12448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 15:54:20 +00:00
Diego Biurrun e982d4d39f Remove the unused function roundToInt16. It is a duplicate of the same function 
in swscale.c. Fixes the warning:
yuv2rgb_altivec.c:751: 'roundToInt16' defined but not used

Originally committed as revision 26247 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-15 10:04:19 +00:00
Diego Biurrun 5dff04fc51 Only check for altivec.h when not using Apple gcc and not adding -faltivec to 
CFLAGS. This avoids a couple of warnings of the type
'#warning: Ignoring <altivec.h> because "-faltivec" specified'.

Originally committed as revision 12445 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 09:47:49 +00:00
Diego Biurrun 0870c7674a cosmetics: Reformat Apple cc check. 
Originally committed as revision 12444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 09:45:06 +00:00
Diego Biurrun 216d513c34 typos 
Originally committed as revision 12443 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 21:50:23 +00:00
Diego Biurrun b2c26e2717 Use correct t printf modifier for pointer differences. 
Originally committed as revision 12442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 13:19:39 +00:00
Diego Biurrun 6e69586b44 Build ffserver_g as well as ffserver, consistent with the other binaries. 
Originally committed as revision 12439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 12:44:07 +00:00
Diego Biurrun 768a920572 #include stddef.h instead of sys/types.h, the former is a standard C header. 
Originally committed as revision 12435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-13 18:30:07 +00:00
Diego Biurrun 32573a74bf #include stdint.h instead of inttypes.h like all libavutil headers do. 
Originally committed as revision 12433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-13 18:17:03 +00:00
Diego Biurrun bfb80dbe21 This file does not use size_t, so no need to #include <sys/types.h>. 
Originally committed as revision 12432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-13 18:10:58 +00:00
Diego Biurrun a087028ad8 Add #include "config.h" to headers that need it. 
Originally committed as revision 12431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-13 18:04:21 +00:00
Diego Biurrun 6ef2912879 Add missing stdint.h #include to headers that use it. 
Originally committed as revision 12429 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-13 00:20:15 +00:00
Diego Biurrun 2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Diego Biurrun 88a7a2dc6c wording improvement by the Wanderer 
Originally committed as revision 12427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:54:21 +00:00
Diego Biurrun a6f6b237e2 typos 
Originally committed as revision 26228 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-12 23:50:48 +00:00
Diego Biurrun 315c741d3d Move dependency generation commands into configure. 
This will allow specifying gcc-independent commands in the future.

Originally committed as revision 12426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:30:35 +00:00
Diego Biurrun 0138c54ec6 Use proper library versions instead of SPPVERSION in Darwin SHFLAGS. 
Originally committed as revision 12423 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 19:27:24 +00:00
Diego Biurrun f63b6dc0ff Do not calculate dependencies for header files in the .vhookdepend target. 
Originally committed as revision 12422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 09:42:36 +00:00
Diego Biurrun 8df4da4eb3 Use $^ without header files instead of $(SRCS) to reference the dependencies 
of the .depend target. $^ apparently includes the full path to files found
in a vpath directory, $(SRCS) does not. This makes out of tree builds fail.

Originally committed as revision 12421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 09:40:36 +00:00
Diego Biurrun a04e32407d Mark Y variable in EPILOG macro as av_unused to avoid unused variable warnings. 
Originally committed as revision 26220 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-11 09:01:38 +00:00
Diego Biurrun b7860763ca Clarify comment. 
Originally committed as revision 12419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 22:59:05 +00:00
Diego Biurrun 30a3ad750b Simplify .depend generation command. 
Originally committed as revision 12414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 20:18:40 +00:00
Diego Biurrun 7853bf93b2 Replace the awkward '1>' with the more natural '>'. 
Originally committed as revision 12413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 20:12:27 +00:00
Diego Biurrun 3c889b5cf7 Merge SDL_CFLAGS handling for files that need it. 
Originally committed as revision 12412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 20:01:50 +00:00
Diego Biurrun 7ce6892373 misc spelling fixes 
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 18:42:09 +00:00
Diego Biurrun 06de58d2a8 typo 
Originally committed as revision 26212 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-10 18:38:46 +00:00
Diego Biurrun bab785a5f9 vhooks really need libav* even if they compile fine without on Linux. 
Originally committed as revision 12409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 18:37:18 +00:00
Diego Biurrun 13ca50f367 Rename --enable-swscaler --> enable-swscale to be consistent with the 
directory name and other option names. Also rename variables accordingly.

Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 17:54:24 +00:00
Diego Biurrun 3f0bc115f1 Remove redundant swScaler: output from places where av_log() 
properly prints the context anyway.

Originally committed as revision 26207 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-10 07:30:24 +00:00
Diego Biurrun 88855b51cd Work around gcc stupidity: With -MM gcc outputs just the basename of files as 
target name. This breaks when compiling targets in subdirectories, so prepend
the subdirectory name to the target name.

Originally committed as revision 12398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 18:29:41 +00:00
Diego Biurrun c123486e44 #error in case we do not know how to provide alignment. 
Originally committed as revision 12382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 20:30:15 +00:00
Diego Biurrun e73e4e75f9 cosmetics: Fix indentation in a few more places. 
Originally committed as revision 12381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 20:27:16 +00:00
Diego Biurrun ef3dfbd427 cosmetics: Normalize {} placement after for, while, if. 
Originally committed as revision 12380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 20:24:24 +00:00
Diego Biurrun 72b8963d43 Mention that libavdevice/x11grab.c is GPLed. 
Originally committed as revision 12379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 19:24:06 +00:00
Diego Biurrun 4a24ab64b1 Rename pp variable to postproc for consistency. 
Originally committed as revision 12376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 18:50:38 +00:00
Diego Biurrun 61c510887b cosmetics: prettyprinting 
Originally committed as revision 12369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 16:19:46 +00:00
Diego Biurrun 3d323571d6 Install libavfilter if it has been enabled. 
Originally committed as revision 12368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 16:19:03 +00:00
Diego Biurrun 4c85ae7ba5 The videohook target does not depend on .libs. 
Originally committed as revision 12367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 15:19:07 +00:00
Diego Biurrun c7193373fb Make ffplay use parse_number_or_die instead of atoi. 
Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 15:06:43 +00:00
Diego Biurrun 69ed2c3b92 cosmetics: Remove useless empty line. 
Originally committed as revision 26201 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2008-03-08 14:54:36 +00:00
Diego Biurrun 0050adee97 cosmetics: Remove useless empty line. 
Originally committed as revision 12365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 14:54:15 +00:00