1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 620c6292b1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:57:00 +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-12 23:57:00 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
libavdevice v4l2: use av_assert 2012-07-08 17:59:56 +02:00
libavfilter lavfi/movie: reindent after the previous patch 2012-07-10 01:37:54 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
libavutil av_samples_copy: support overlapping copies 2012-07-12 22:25:25 +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/x86: 16bit integer mix functions need SSE2 not SSE 2012-07-07 20:52:34 +02:00
libswscale lavu: 256 color support 2012-07-07 01:41:55 +00:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: add test for paf demuxer 2012-07-10 00:04: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 Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-07-08 22:33:32 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +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 remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c add output for frame timestamps 2012-07-12 20:18:03 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
ffprobe.c cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +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-03-26 20:52:52 +02:00
LICENSE Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
MAINTAINERS FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
Makefile Makefile: remove checkheaders from the main check target 2012-06-29 00:05:40 +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.