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 416d2f7a12 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vc1: export some functions
  configure: use HOSTCC_C/O in check_host_cc
  configure: use AS_O setting in check_as
  configure: use LD_O setting in check_ld()
  Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
  build: Restore dependency of acelp_filters.o on celp_math.o
  celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
  celp_math: Move ff_cos() to the only place it is used
  build: Use portable abstraction for linker/hostcc output file syntax
  configure: Fix shared library creation for OpenBSD
  vp56: Don't use DECLARE_ALIGN on a typedef name
  mss1: move code that will be reused by MSS2 decoder into separate file
  mss1: merge decode_intra() and decode_inter()
  avprobe: Get rid of ugly casts in the options table
  vf_hqdn3d: Remove a duplicate inline declaration

Conflicts:
	Makefile
	configure
	ffprobe.c
	libavcodec/Makefile
	libavcodec/amrnbdec.c
	libavcodec/amrwbdec.c
	libavcodec/celp_math.c
	libavcodec/celp_math.h
	libavcodec/dsputil.c
	libavcodec/lsp.c
	libavcodec/mss1.c
	libavcodec/ra288.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-28 16:28:48 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
doc cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
libavdevice dshow:protect access to curbufsize to promote consistency 2012-08-20 20:58:05 +02:00
libavfilter vf_hqdn3d: remove duplicate inline 2012-08-28 05:31:20 +02:00
libavformat aiffdec: support QDM2 2012-08-28 03:18:21 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
libpostproc rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
libswscale rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
mt-work Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests dpx: 10 and 12 bit decoding 2012-08-27 18:31:21 +02:00
tools tools: add make_chlayout_test perl script. 2012-08-28 15:18:27 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles. 2012-08-25 13:15:41 -07:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
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
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c ffmpeg: make decoding_needed a counter. 2012-08-22 19:04:30 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2012-08-26 02:34:24 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
ffplay.c ffplay: fix odd YUV width by cropping the video 2012-08-27 01:44:57 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +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-08-28 16:28:48 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +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.