RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
48,104 Commits 36 Branches 392 Tags 310 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 98256622a6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flac: only set channel layout if not previously set or on channel count change
  prepare 9_beta3 release

Conflicts:
	RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-12-22 13:25:53 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc doc/filters: rename reference to movie filter from "src_movie" to "movie" 2012-12-22 01:03:46 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-12-22 13:25:53 +01:00
libavdevice Support H264 over video4linux2. 2012-12-21 18:12:29 +01:00
libavfilter lavfi: declare arrays that never change as static const 2012-12-21 22:38:59 +00:00
libavformat img2enc: fix typo 2012-12-21 22:56:13 +01:00
libavresample Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-12-20 02:51:35 +01:00
libpostproc pp: fix a few typo in the template. 2012-12-19 17:59:25 +01:00
libswresample swr/doxy: fix missing quote in code example. 2012-12-16 21:04:54 +01:00
libswscale Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
tools Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
…
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Changelog Merge commit 'acb571c89a065d943163c11efb46de35774f1909' 2012-12-20 02:44:22 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: update my GPG key fingerprint 2012-12-18 23:08:02 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE prepare 9_beta3 release 2012-12-21 15:16:33 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
cmdutils.h Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
ffmpeg.c Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +01:00
ffmpeg_filter.c Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3' 2012-12-19 22:04:03 +01:00
ffmpeg_opt.c ffmpeg_opt: fix recording time in->out carryover. 2012-12-20 17:45:43 +01:00
ffplay.c ffplay: fix another use of context instead of frame parameters 2012-12-22 03:41:55 +01:00
ffprobe.c ffprobe: show pkt_size in frame 2012-12-15 11:46:47 +01:00
ffserver.c ffserver: set oformat 2012-12-09 23:39:06 +01:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.