FFmpeg git repo
Go to file
Michael Niedermayer 0fecf2642b Merge remote-tracking branch 'newdev/master'
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
doc Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-09 03:33:56 +01:00
libavcodec Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
libavdevice Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
libavfilter Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
libavformat Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
libavutil Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
libpostproc use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
libswscale use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
tests Revert "ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset." 2011-03-15 15:12:17 +01:00
tools In graph2dot, print more specific audio information for audio links. 2011-02-18 19:52:25 +01:00
.gitignore consolidate .gitignore patters into a single file 2011-01-18 21:32:05 +01:00
Changelog Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
cmdutils.h Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file". 2011-03-08 17:34:02 +01:00
common.mak Merge libavcore into libavutil 2011-02-16 23:00:30 +01:00
configure Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS partially rename FFmpeg to Libav 2011-03-16 21:54:39 +01:00
Doxyfile partially rename FFmpeg to Libav 2011-03-16 21:54:39 +01:00
ffmpeg.c Fix compilation error when CONFIG_AVFILTER is not defined. 2011-03-17 01:35:08 +01:00
ffplay.c Merge remote-tracking branch 'newdev/master' 2011-03-15 16:48:42 +01:00
ffprobe.c lavf: add av_ prefix to dump_format() 2011-02-18 19:52:28 +01:00
ffserver.c avio: deprecate url_open_buf 2011-03-16 22:59:39 -04:00
ffserver.h
INSTALL partially rename FFmpeg to Libav 2011-03-16 21:54:39 +01:00
LICENSE partially rename FFmpeg to Libav 2011-03-16 21:54:39 +01:00
MAINTAINERS Delete MAINTAINERS file 2011-03-14 21:13:27 +00:00
Makefile replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION 2011-03-16 21:54:39 +01:00
README partially rename FFmpeg to Libav 2011-03-16 21:54:39 +01:00
subdir.mak fix building test programs with gnu make 3.82 2010-12-07 16:42:25 +00:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00

Libav README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.