Mirror of FFmpeg
Find a file
Michael Niedermayer bf2f93cdbf Merge commit '28c8e288fa'
* commit '28c8e288fa':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 00:43:45 +01:00
compat Merge commit '0c03cc6838' 2012-10-24 13:42:58 +02:00
doc Merge commit '28c8e288fa' 2012-11-26 00:43:45 +01:00
libavcodec Merge commit '28c8e288fa' 2012-11-26 00:43:45 +01:00
libavdevice dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions 2012-11-16 19:26:13 +01:00
libavfilter avfiltergraph: add AVOption table 2012-11-25 14:36:22 +01:00
libavformat Merge commit '28c8e288fa' 2012-11-26 00:43:45 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-11-18 13:35:15 +01:00
libavutil lavu/samplefmt: return the size of the allocated samples buffer at the next bump 2012-11-25 23:23:24 +01:00
libpostproc pp: add SSE2 deInterlaceInterpolateCubic(). 2012-11-18 16:21:59 +01:00
libswresample swr: include stdint.h instead of inttypes.h. 2012-11-20 21:53:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-11-19 14:24:20 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Add an annotation field as required by the specification when muxing Sun AU. 2012-11-24 10:43:11 +01:00
tools Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.gitignore .gitignore: ignore *.3 files as well 2012-11-06 12:24:12 +01:00
arch.mak Merge commit 'ca411fc1d3' 2012-10-13 15:25:11 +02:00
Changelog ADPCM IMA Dialogic decoder 2012-11-24 10:56:47 +00:00
cmdutils.c replace av_log(0, by av_log(NULL, 2012-11-23 18:10:02 +01:00
cmdutils.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
cmdutils_common_opts.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
common.mak Merge commit '4a606c830a' 2012-11-23 13:30:51 +01:00
configure Merge commit '28c8e288fa' 2012-11-26 00:43:45 +01: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
ffmpeg.c ffmpeg: fix mixed declarations and statements. 2012-11-24 03:02:11 +01:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffmpeg_filter.c Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
ffmpeg_opt.c Merge commit '28c8e288fa' 2012-11-26 00:43:45 +01:00
ffplay.c ffplay: adjust external clock speed based on buffer fullness for realtime sources 2012-11-04 18:29:49 +01:00
ffprobe.c ffprobe: free dictionary in opt_show_entries() 2012-11-23 18:49:26 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-11-16 13:23:35 +01:00
INSTALL
library.mak Merge commit '4a606c830a' 2012-11-23 13:30:51 +01:00
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: fix entry for img2 2012-11-06 01:46:21 +01:00
Makefile Merge commit '4a606c830a' 2012-11-23 13:30:51 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041' 2012-10-24 14:01:36 +02:00
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.