RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
51,845 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
31428240ec
Go to file
Michael Niedermayer 31428240ec Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b' 
* commit 'c43a7ecad997fc527af34b952334f3d030709a1b':
  lavfi: remove now unused args parameter from AVFilter.init

Conflicts:
	libavfilter/avfilter.c
	libavfilter/buffersrc.c
	libavfilter/f_select.c
	libavfilter/src_movie.c
	libavfilter/vf_alphamerge.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c

Not merged (yet) because there are still many filters that use the args
parameter.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 10:25:42 +02:00
compat
doc Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1' 2013-04-11 10:02:07 +02:00
libavcodec Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525' 2013-04-10 12:41:06 +02:00
libavdevice
libavfilter Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1' 2013-04-11 10:02:07 +02:00
libavformat lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
libavresample
libavutil avutil/opencl: add opencl device list APIs 20130411 2013-04-11 03:48:57 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample
libswscale Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
presets
tests Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a' 2013-04-11 02:10:12 +02:00
tools Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak
Changelog lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: remove error message from opt_default() in case of missing option 2013-04-05 10:48:32 +02:00
cmdutils.h
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffmpeg.c ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
ffmpeg.h ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffplay.c ffplay: simplify video pts calculation 2013-04-08 22:21:45 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
README
RELEASE
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.