Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
Go to file
Michael Niedermayer 87b9dc0982 Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'
The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.

* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
  lavfi: merge start_frame/draw_slice/end_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:51:22 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc' 2012-11-28 23:59:15 +01:00
libavcodec pgssubdec: remove unused variable 2012-11-28 16:21:25 +00:00
libavdevice dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions 2012-11-16 19:26:13 +01:00
libavfilter Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666' 2012-11-29 02:51:22 +01:00
libavformat Vivo demuxer 2012-11-28 20:13:05 +00:00
libavresample Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
libavutil Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1' 2012-11-28 13:32:17 +01:00
libpostproc pp: add SSE2 deInterlaceInterpolateCubic(). 2012-11-18 16:21:59 +01:00
libswresample swr: include stdint.h instead of inttypes.h. 2012-11-20 21:53:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-11-19 14:24:20 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc' 2012-11-28 23:59:15 +01:00
tools Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.gitignore .gitignore: ignore *.3 files as well 2012-11-06 12:24:12 +01:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog ADPCM IMA Dialogic decoder 2012-11-24 10:56:47 +00:00
cmdutils_common_opts.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
cmdutils.c replace av_log(0, by av_log(NULL, 2012-11-23 18:10:02 +01:00
cmdutils.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
common.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
configure configure: Enable avconv filter dependencies automatically 2012-11-27 17:05:01 +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 Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
ffmpeg_filter.c ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg_opt.c ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg.c ffmpeg: fix mixed declarations and statements. 2012-11-24 03:02:11 +01:00
ffmpeg.h ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffplay.c ffplay: adjust external clock speed based on buffer fullness for realtime sources 2012-11-04 18:29:49 +01:00
ffprobe.c ffprobe: free dictionary in opt_show_entries() 2012-11-23 18:49:26 +01:00
ffserver.c ffserver remove CONFIG_NOCUTILS check 2012-11-27 14:41:41 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: fix entry for img2 2012-11-06 01:46:21 +01:00
Makefile Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +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.