1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 204c4e953d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ppc: fix build with altivec disabled
  vp3: move idct and loop filter pointers to new vp3dsp context
  build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
  tscc2: do not add/subtract 128 bias during DCT
  tscc2: fix typo in DCT
  configure: clarify external library section of help output
  configure: mark libfdk-aac as nonfree
  configure: cosmetics: drop some unnecessary backslashes
  os_support: K&R formatting cosmetics

Conflicts:
	configure
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-18 22:34:48 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-07-18 01:27:19 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
libavdevice v4l2: use av_assert 2012-07-08 17:59:56 +02:00
libavfilter avfiltergraph: add some debug info about selected pixel formats 2012-07-18 17:22:17 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
libavutil lavu: disable av_uninit for clang 2012-07-16 19:30:13 +00:00
libpostproc pp: check that the argument is not NULL as this is not supported 2012-07-07 19:14:21 +02:00
libswresample lswr: channel_map requires input conversion. 2012-07-17 09:50:36 +02:00
libswscale sws: more complete doxy for sws_setColorspaceDetails() 2012-07-18 21:25:29 +02:00
mt-work
presets
tests ptx: correct decoding 2012-07-17 17:06:24 +00:00
tools tools/bisect: rename to tools/bisect-create 2012-07-07 14:51:51 +02:00
.gitignore tools/bisect: rename temporary file and add it to git ignore 2012-07-07 13:15:01 +02:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2012-07-18 01:27:19 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-07-08 22:33:32 +02:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines) 2012-07-18 16:35:38 +02:00
ffplay.c
ffprobe.c ffprobe: reindent after the previous commit 2012-07-15 16:27:22 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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.