Go to file
Michael Niedermayer edab63a406 Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:26:57 +02:00
compat
doc doc/codecs: fix dangling reference to codec-options chapter 2013-07-27 16:50:19 +02:00
libavcodec lavc: do not override format if neither text nor bitmap codec prop is set 2013-07-27 23:03:00 +02:00
libavdevice avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE 2013-07-26 15:21:25 +00:00
libavfilter Merge commit '966689442ed843019dc0722a49bfb0ac51755d19' 2013-07-28 11:26:57 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-07-27 09:43:29 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
libavutil lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too 2013-07-25 20:41:39 +00:00
libpostproc
libswresample swresample: fix negative rematrix volumns 2013-07-22 03:24:22 +02:00
libswscale swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
tools
.gitignore
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a' 2013-07-27 09:13:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.