1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 6ca48ad044 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  amr: Cosmetic cleanup
  mov_chan: Fix operator precedence by adding parentheses
  doc: Add missing protocols to list of supported protocols.
  tcp: Check the listen call

Conflicts:
	libavformat/amr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-17 22:28:28 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-17 22:28:28 +02:00
libavcodec intel h263 dec: support advanced prediction 2012-06-17 21:32:43 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
libavfilter lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-17 22:28:28 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-30 19:32:06 +02:00
libavutil attributes: move av_restrict fallback from internal to attributes 2012-06-17 18:05:31 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swr: fix 10l use of uninitialized data 2012-06-13 13:43:42 +02:00
libswscale sws/swscale_unscaled: use av_assert 2012-06-16 17:34:07 +02:00
mt-work
presets
tests fate: fix fate-aac-aref-encode dependancies 2012-06-17 17:59:00 +02:00
tools tools/graph2dot: factorize code printing non-media specific link information 2012-06-06 23:20: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 lavfi: add atempo filter 2012-06-17 12:50:35 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: dont return void from a void function 2012-06-10 02:38:01 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
common.mak
configure lavfi: add atempo filter 2012-06-17 12:50:35 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
ffprobe.c ffprobe: add writer_print_rational() 2012-06-16 00:42:54 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
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
RELEASE
version.sh

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.