RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
51,917 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%
580a0600ef
Go to file
Michael Niedermayer 580a0600ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavcodec/gif.c
	libavcodec/x86/dsputilenc_mmx.c
	libavcodec/x86/fmtconvert_init.c
	libavformat/au.c
	libavformat/gif.c
	libavformat/mov.c
	libavformat/nsvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:56:18 +02:00
compat
doc lavfi/asetnsamples: switch to an AVOptions-based system. 2013-04-11 15:40:15 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-04-11 15:56:18 +02:00
libavdevice
libavfilter lavfi: add pp to the ':'-to-'|' compat layer. 2013-04-11 15:52:46 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-04-11 15:56:18 +02:00
libavresample
libavutil opencl: add spec opencl device APIs 20130411 2013-04-11 12:46:34 +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 fate: add tests for unknown channel layouts. 2013-04-11 13:09:33 +02:00
tools Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
.gitignore
arch.mak
Changelog telecine filter 2013-04-11 11:12:39 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-04-11 12:32:29 +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 MAINTAINERS: add opencl maintainer 2013-04-11 13:42:07 +02:00
Makefile
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.