1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer ca7fa3a516 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  AVOptions: fix the value printed in out of range error message.

Conflicts:
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-28 22:07:34 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
libavcodec Fix r10k codec for widths that are not multiples of 64. 2012-05-28 19:05:15 +02:00
libavdevice avdevice: bump soname due to lavf soname bump 2012-05-25 12:22:21 +02:00
libavfilter lswsutils: fix "ncompatible pointer type" warning 2012-05-26 20:46:00 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-05-28 00:50:23 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-05-28 22:07:34 +02:00
libpostproc
libswresample swr: fix swr_drop_output() 2012-05-26 02:33:38 +02:00
libswscale Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Mark avui encoder experimental. 2012-05-28 18:20:39 +02:00
tools tests and tools: cleanup ffmpeg reference 2012-05-27 15:42:55 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog Changelog: fix wrong/inaccurate entries. 2012-05-27 15:28:24 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c cmdutils: allow to specify a stream by its ID. 2012-05-20 12:47:27 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure configure: disable avresample by default 2012-05-28 19:43:57 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
ffplay.c ffplay: force exit when filter configuration fails 2012-05-24 23:48:52 +02:00
ffprobe.c ffprobe: reduce the number of AVBPrint resets. 2012-05-26 22:53:13 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: update versions 2012-05-24 21:15:01 +02:00
Makefile doc/examples: install them with the shared data. 2012-05-19 12:28:59 +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

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.