RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
55,094 Commits 36 Branches 392 Tags 308 MiB
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer c7d1717957 Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Conflicts:
	doc/general.texi
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2013-07-30 11:26:39 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 2013-07-30 11:26:39 +02:00
libavcodec Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e' 2013-07-30 09:50:26 +02:00
libavdevice avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE 2013-07-26 15:21:25 +00:00
libavfilter Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8' 2013-07-30 11:26:39 +02:00
libavformat Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd' 2013-07-30 10:26:04 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
libavutil Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184' 2013-07-30 11:06:03 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swresample: fix negative rematrix volumns 2013-07-22 03:24:22 +02:00
libswscale swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
presets
…
tests Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7' 2013-07-30 11:13:34 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
Changelog lavfi: add compand filter 2013-07-29 19:11:50 +00:00
INSTALL
…
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: drop 1.1 from the releases that i maintain 2013-07-15 02:30:36 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README
…
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79' 2013-07-30 11:20:12 +02:00
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c ffmpeg_opt: do not warn about unused gop_timecode 2013-07-09 10:54:40 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
ffserver.c Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
version.sh
…

README 

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.