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 3bca69c2a8 Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'
* commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3':
  doc: Fix a few typos in the developer documentation
  xwma: Remove unused variable
  asfdec: Fix printf format string length modifier

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 12:34:14 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3' 2013-01-08 12:34:14 +01:00
libavcodec mjpegdec: allow 2 components in ljpeg_decode_yuv_scan() 2013-01-08 02:54:21 +01:00
libavdevice Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8' 2013-01-04 13:01:54 +01:00
libavfilter lavfi/kerndeint: remove unused pixel_step. 2013-01-06 18:59:15 +01:00
libavformat Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3' 2013-01-08 12:34:14 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-06 13:20:23 +01:00
libavutil Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0' 2013-01-07 01:35:18 +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 presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests tests/fate/avfilter.mak: merge pp tests into GPL test list 2013-01-06 19:04:24 +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
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Add forgotten AVC Intra entry to Changelog. 2013-01-08 01:08:36 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +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
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Drop Snow codec 2013-01-06 16:30:02 +01: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_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
ffmpeg.c add note on windows pipe 2013-01-06 17:47:49 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +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
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: add 1.1, remove 0.10 2013-01-06 21:42:35 +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 RELEASE: 1.1.git for master 2013-01-06 21:42:35 +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.