virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
31,032 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
f211d9d839
Go to file
Michael Niedermayer f211d9d839 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: improve rules for test programs
  build: factor out the .c and .S compile commands as a macro
  swscale: remove unused xInc/srcW arguments from hScale().
  H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
  H.264: make filter_mb_fast support 4:4:4
  mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
  configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
  Move some variable declarations below the proper #ifdefs.

Conflicts:
	Makefile
	ffplay.c
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-27 03:32:45 +02:00
doc lavfi: add testsrc source 2011-06-26 19:49:24 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-27 03:32:45 +02:00
libavdevice Revert "build: Remove redundant config.mak includes from subdirectory Makefiles." 2011-06-26 09:49:36 +02:00
libavfilter lavfi: add testsrc source 2011-06-26 19:49:24 +02:00
libavformat Revert "build: Remove redundant config.mak includes from subdirectory Makefiles." 2011-06-26 09:49:36 +02:00
libavutil Revert "build: Remove redundant config.mak includes from subdirectory Makefiles." 2011-06-26 09:49:36 +02:00
libpostproc Revert "build: Remove redundant config.mak includes from subdirectory Makefiles." 2011-06-26 09:49:36 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-06-27 03:32:45 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog Changelog: merge various 0.7* sections into a single 0.8 section 2011-06-24 11:15:19 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c parse_options(): Avoid passing NULL as a string arg to fprintf 2011-06-24 13:04:51 -04:00
cmdutils.h lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-27 03:32:45 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-27 03:32:45 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2. 2011-06-26 14:09:48 -07:00
ffplay.c Move some variable declarations below the proper #ifdefs. 2011-06-26 16:32:13 +02:00
ffprobe.c ffprobe: remove duplicate avformat_alloc_context() 2011-06-21 14:38:58 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile build: factor out the .c and .S compile commands as a macro 2011-06-26 23:07:40 +01:00
README
RELEASE Use the contents of RELEASE as version fallback instead of 'UNKNOWN' 2011-06-19 19:54:07 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-27 03:32:45 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.