No description
Find a file
Michael Niedermayer ee77140afa Merge commit 'b2bed9325d'
* commit 'b2bed9325d':
  cosmetics: Group .name and .long_name together in codec/format declarations

Conflicts:
	libavcodec/8svx.c
	libavcodec/alac.c
	libavcodec/cljr.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/dpxenc.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/ffv1dec.c
	libavcodec/flacdec.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g726.c
	libavcodec/gif.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/h263dec.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopencore-amr.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libspeexenc.c
	libavcodec/libvo-amrwbenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/msmpeg4dec.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/proresdec_lgpl.c
	libavcodec/proresenc_kostya.c
	libavcodec/ra144enc.c
	libavcodec/rawdec.c
	libavcodec/rv10.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tta.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/wavpack.c
	libavcodec/xbmenc.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 12:34:23 +02:00
compat Merge commit 'ef51692a49' 2013-08-28 12:46:12 +02:00
doc avcodec: add av_codec_get_max_lowres() 2013-10-03 16:33:09 +02:00
libavcodec Merge commit 'b2bed9325d' 2013-10-04 12:34:23 +02:00
libavdevice avdevice/v4l: remove duplicate include 2013-09-21 15:36:33 +02:00
libavfilter avfilter/vf_frei0r: fix out of array read 2013-10-04 11:16:35 +02:00
libavformat Merge commit '49fe9c05f9' 2013-10-04 12:01:17 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil Merge commit '80fefbed62' 2013-10-04 11:28:21 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swr: fix example code and doxy indent. 2013-09-29 23:37:46 +02:00
libswscale swscale/utils: dont divide by zero with zero vectors 2013-10-01 00:27:28 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests avformat/vobsub: raise packet even if apparently incomplete. 2013-10-04 09:25:11 +00:00
tools ffhash: Change size to an int 2013-09-24 16:29:18 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak Merge commit 'b326755989' 2012-12-08 14:24:16 +01:00
Changelog Native VP9 decoder. 2013-10-02 21:03:11 -04:00
cmdutils.c cmdutils: print command support in -filters. 2013-09-30 10:15:22 +00:00
cmdutils.h Merge commit '636ced8e1d' 2013-07-08 04:34:11 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
common.mak Merge commit '47b6cfc2a0' 2013-10-04 11:49:01 +02:00
configure Merge remote-tracking branch 'rbultje/master' 2013-10-03 13:56:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg.c ffmpeg: dont return reserved values 2013-10-02 12:59:39 +02:00
ffmpeg.h Merge commit '488a0fa689' 2013-08-06 12:41:04 +02:00
ffmpeg_filter.c ffmpeg_filter: check that the input media type match the filter 2013-08-14 03:03:41 +02:00
ffmpeg_opt.c ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres() 2013-10-03 17:20:53 +02:00
ffplay.c ffplay: avoid direct access to lowres use av_codec_g/set_lowres() 2013-10-03 22:38:54 +02:00
ffprobe.c ffprobe: print stream channel_layout when available 2013-10-03 09:19:38 +02:00
ffserver.c ffserver: allow choosing the pixel format 2013-09-14 03:51:45 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '472391b9a7' 2013-03-28 12:12:38 +01:00
LICENSE avfilter: port pullup filter from libmpcodecs 2013-09-17 17:03:36 +00:00
MAINTAINERS lavf/libssh: add MAINTAINERS entry 2013-09-21 16:35:41 +02:00
Makefile Merge commit '90f9a5830b' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Update for 2.0 2013-07-10 02:15:43 +02: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.