Go to file
Michael Niedermayer a6ff8514a9 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  wtv: Check the return value from gmtime
  x86: fft: convert sse inline asm to yasm
  x86: place some inline asm under #if HAVE_INLINE_ASM

Conflicts:
	libavcodec/x86/fft_sse.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-25 16:55:31 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-24 21:34:54 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
libavdevice lavd/lavfi: do not set the channel layout list. 2012-06-21 19:40:49 +02:00
libavfilter lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API 2012-06-25 13:42:47 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swresample: make .class_name more descriptive 2012-06-22 14:01:15 +00:00
libswscale swscale: use designated initializers for AVClass 2012-06-22 02:34:34 +00:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests vocenc: use new header from codec tag 4 2012-06-25 03:45:29 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c codec_release_buffer: fix handling of non user buffers 2012-06-22 23:53:24 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure configure: fix libavutil.pc generation 2012-06-24 20:11:11 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API 2012-06-25 13:42:47 +02:00
ffplay.c ffplay: give more meaningful names to the buffersink instances 2012-06-25 13:42:53 +02:00
ffprobe.c ffprobe: dump AVPacket.convergence_duration. 2012-06-18 09:39:17 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS MAINTAINERS: reorganize entries in the libavfilter section 2012-06-17 22:17:44 +02:00
Makefile Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.