FFmpeg git repo
Go to file
Michael Niedermayer c6d39fb3c5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: sanitize linking of tools and test programs
  fate: Refactor setting of environment variables for groups of tests

Conflicts:
	tests/fate/audio.mak
	tests/fate/real.mak
	tests/fate/voice.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 14:13:51 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
libavcodec Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' 2012-10-10 14:07:05 +02:00
libavdevice Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' 2012-10-10 14:07:05 +02:00
libavformat Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' 2012-10-10 14:07:05 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample swr-test: avoid VLA 2012-10-06 13:48:47 +02:00
libswscale Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' 2012-10-10 14:07:05 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-10-10 14:13:51 +02:00
tools Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02: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 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS MAINTAINERS: add 1.0 2012-09-27 01:48:14 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update for 1.0 2012-09-27 01:48:14 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
cmdutils.c Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a' 2012-10-10 13:18:05 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-10-09 13:06:04 +02:00
ffmpeg.c Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffmpeg.h Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffmpeg_filter.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffmpeg_opt.c Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffplay.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffprobe.c ffprobe: reindent after previous commit 2012-10-05 23:58:23 +02:00
ffserver.c ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier. 2012-10-02 22:59:03 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-10 14:13:51 +02: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.