FFmpeg git repo
Go to file
Michael Niedermayer bb4fb7715c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: fix NULL checking in sws_alloc_context()
  mxfdec: fix NULL checking in mxf_get_sorted_table_segments()
  finalize changelog for version 9

Conflicts:
	Changelog
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 13:37:30 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit 'b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a' 2013-01-05 13:27:59 +01:00
libavcodec alsdec: change channel sorting so it match reference implementation 2013-01-05 09:36:14 +00:00
libavdevice Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8' 2013-01-04 13:01:54 +01:00
libavfilter lavfi/drawutils: fix blending computation in blend_line function 2013-01-05 13:08:02 +01:00
libavformat w64dec: support metadata (summarylist guid) 2013-01-05 11:03:52 +00:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-04 13:29:15 +01:00
libavutil lavu: check that assert level is defined 2013-01-05 12:21:39 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample lswr: Improve default resampler's default parameters 2013-01-04 16:47:57 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2013-01-05 13:37:30 +01:00
presets
tests lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
tools Fix "knwon" typo and add a check in tools/patcheck 2013-01-04 19:24:37 +00:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
INSTALL
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: s/mjpeg.c/mjpeg*.c/ 2012-12-28 13:04:44 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c cmdutils: update copyright year to 2013 2013-01-03 13:35:12 +02:00
cmdutils.h Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01: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 lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
ffmpeg.c ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate 2012-12-27 15:47:15 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 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 mpegpsenc: Fix SCR handling for DVD 2013-01-04 20:58:59 +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: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
version.sh

README

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.