No description
Find a file
Michael Niedermayer 11dfd2a74a Merge commit '7fd6c9fb49' into release/1.1
* commit '7fd6c9fb49':
  h264: reset first_field if frame_start() fails for missing refs

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-21 15:28:24 +02:00
compat Merge commit '0c03cc6838' 2012-10-24 13:42:58 +02:00
doc Merge commit 'd791e8c990' into release/1.1 2014-04-21 14:20:35 +02:00
libavcodec Merge commit '7fd6c9fb49' into release/1.1 2014-04-21 15:28:24 +02:00
libavdevice avdevice/v4l2: only use average frame rate if set 2014-03-07 04:04:07 +01:00
libavfilter configure: Special case libfreetype test 2014-04-21 14:05:30 +02:00
libavformat avformat/mov: fix keyframe flags for sample from chromium Issue 340865 2014-03-24 23:38:13 +01:00
libavresample Merge commit '65830277d2' into release/1.1 2014-01-12 16:51:26 +01:00
libavutil avutil/log: skip IO calls on empty strings 2014-03-07 04:04:07 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 2013-08-20 18:45:21 +02:00
libswscale Merge commit '1ab4578c88' into release/1.1 2013-05-12 14:31:59 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '56eded8bc7' into release/1.1 2013-12-21 02:31:41 +01:00
tools Merge commit 'cb95c1935f' into release/1.1 2014-04-21 13:32:22 +02:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
cmdutils.c cmdutils: update copyright year to 2014. 2014-04-14 16:55:37 -04:00
cmdutils.h cmdutils: avtool -> fftool 2013-05-13 00:45:09 +02:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure configure: Special case libfreetype test 2014-04-21 14:05:30 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
ffmpeg.c Merge commit 'fa6eef4210' into release/1.1 2013-08-27 16:30:57 +02:00
ffmpeg.h Merge commit '77bd1bc73a' 2012-12-20 02:38:02 +01:00
ffmpeg_filter.c ffmpeg: sub2video: set resample size. 2013-01-01 23:06:34 +01:00
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 02:03:05 +01:00
ffplay.c Replace references to "que" with the appropriate word. 2013-01-03 00:21:47 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:55:38 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: mention that people are welcome to pick up and maintain older releases 2013-03-18 03:35:47 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Prepare for 9.13 Release 2014-03-29 13:12:15 -04:00
VERSION update for 1.1.9 2014-03-07 04:14:03 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.