1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer a7acab6cda Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vc1dec: Remove separate scaling function for interlaced field MVs
  vc1dec: Invoke edge_emulation regardless of MV precision
  x86: Use consistent 3dnowext function and macro name suffixes
  g723_1: scale output as supposed for the case with postfilter disabled
  g723_1: increase excitation storage by 4
  g723_1: fix upper bound parameter from inverse maximum autocorrelation
  g723_1: make scale_vector() behave like the reference
  g723_1: fix off-by-one error in normalize_bits()
  g723_1: save/restore excitation with offset to store LPC history
  wmapro: prevent division by zero when sample rate is unspecified
  x86: proresdsp: improve SIGNEXTEND macro comments
  x86: h264dsp: K&R formatting cosmetics
  LICENSE: Document all GPL files

Conflicts:
	libavcodec/g723_1.c
	libavcodec/wmaprodec.c
	libavcodec/x86/h264dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-03 23:13:06 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc lavfi: move color filter to testsrc, factorize 2012-08-03 16:26:58 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
libavfilter lavfi: move color filter to testsrc, factorize 2012-08-03 16:26:58 +02:00
libavformat paf: fix audio packet duration 2012-08-03 15:18:12 +00:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
libpostproc pp: check that the argument is not NULL as this is not supported 2012-07-07 19:14:21 +02:00
libswresample swr: fix 10l typo mixing in and out config. 2012-08-01 21:18:03 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
tools tools/bisect-create: Support "bisect run" 2012-07-24 01:24:23 +02:00
.gitignore tools/bisect: rename temporary file and add it to git ignore 2012-07-07 13:15:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Canopus Lossless decoder 2012-08-01 22:06:16 -04:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c cmdutils/alloc_buffer: fix typo 2012-07-20 16:42:29 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
common.mak buildsys: fix c++ compilation 2012-07-30 17:51:33 +02:00
configure configure: reduce difference to qatar by 2 lines 2012-08-02 00:41:16 +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
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: honor -ss and -t parameters with muxed subtitles. 2012-08-01 20:37:34 +02:00
ffplay.c ffplay: fix warning that i just mistakenly introduced 2012-07-20 03:47:11 +02:00
ffprobe.c ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
LICENSE Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile build: use COMPILE template for HOSTOBJS 2012-07-26 23:58:59 +01: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.