1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 4ee0984341 Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 13:45:21 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909' 2013-08-06 13:45:21 +02:00
libavcodec Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' 2013-08-06 13:24:22 +02:00
libavdevice avdevice/vfwcap: make constant arrays static 2013-08-03 22:24:31 +02:00
libavfilter Merge commit '3799376dd3373ee255651ed542c75b15665801a8' 2013-08-06 09:35:03 +02:00
libavformat mpegts: add fix_teletext_pts mpegts demuxer option 2013-08-06 02:47:38 +02:00
libavresample Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
libavutil Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909' 2013-08-06 13:45:21 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swresample: fix negative rematrix volumns 2013-07-22 03:24:22 +02:00
libswscale Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: Add vorbiscomment cover art test 2013-08-05 10:48:37 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' 2013-08-06 13:24:22 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
ffserver.c Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 2013-08-06 09:13:51 +02:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: order libavutil entries alphabetically 2013-08-04 11:24:57 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Update for 2.0 2013-07-10 02:15:43 +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.