RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
54,546 Commits 37 Branches 400 Tags 264 MiB
C 90.2%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer b5a87dc193 Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0' 
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af3910

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2013-07-08 04:53:52 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
doc examples/muxing: add support to audio resampling 2013-07-06 12:31:16 +02:00
libavcodec Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0' 2013-07-08 04:53:52 +02:00
libavdevice lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 2013-07-03 13:21:42 +02:00
libavfilter replace some deprecated defines 2013-07-06 05:43:24 +00:00
libavformat Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a' 2013-07-08 04:08:07 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e' 2013-07-07 11:26:28 +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 cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
libswscale swscale: Fix PAL8 input with alpha 2013-06-26 15:14:00 +02:00
presets
…
tests avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases 2013-07-08 02:37:24 +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 lavf: add support for libgme 2013-07-02 18:52:45 +02:00
INSTALL
…
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS MAINTAINERS: add address to contact "AvxSynth Team" 2013-07-03 02:26:13 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README
…
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +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 remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +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 Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump 2013-07-03 13:21:42 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +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.