1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 84f77f8423 Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
  avf: move ff_http_match_no_proxy to network

Conflicts:
	libavformat/internal.h
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-16 23:45:42 +02:00
compat
doc lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
libavcodec Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3' 2013-06-16 23:29:37 +02:00
libavdevice
libavfilter lavfi/spp: fix description. 2013-06-14 06:53:52 +02:00
libavformat Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c' 2013-06-16 23:45:42 +02:00
libavresample
libavutil lavu/adler32: Fix doxy group definition, take two 2013-06-16 12:50:00 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample
libswscale Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper() 2013-06-11 01:14:38 +02:00
presets
tests lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
tools
.gitignore
arch.mak
Changelog lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
Makefile
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.