Go to file
Michael Niedermayer 7cd13f618c Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'
* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
  h264_sei: Return meaningful values

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 08:54:54 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc doc/protocols: Document file protocol options 2013-08-01 04:08:14 +02:00
libavcodec Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0' 2013-08-03 08:54:54 +02:00
libavdevice avdevice/timefilter-test: dont try to optimize par1 for n0=0 case 2013-08-02 17:06:13 +02:00
libavfilter Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f' 2013-08-01 11:36:54 +02:00
libavformat avformat/matroskaenc: make 2 tables static that are not used outside matroskaenc 2013-08-02 21:14:59 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-08-01 13:59:50 +02: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 avdevice/timefilter-test: dont try to optimize par1 for n0=0 case 2013-08-02 17:06:13 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
arch.mak
Changelog avconv: add -n option to immediately exit when output files already exist 2013-07-31 22:28:54 +03:00
cmdutils_common_opts.h
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak
configure Do not suggest to use gas-preprocessor if using it would break compilation. 2013-08-02 23:23:58 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2' 2013-08-01 13:21:34 +02:00
ffmpeg.c ffmpeg: raise level for message printed in case of auto-select pixel format 2013-08-01 21:14:48 +02:00
ffmpeg.h
ffplay.c Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
ffserver.c Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5' 2013-08-01 12:03:24 +02:00
INSTALL
library.mak
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: drop 1.1 from the releases that i maintain 2013-07-15 02:30:36 +02:00
Makefile
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +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.