1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-12 02:14:56 +02:00
Go to file
Michael Niedermayer 72196a4b8d Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'
* commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd':
  smoothstreamingenc: Write to a temp file while updating the manifest

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-28 12:34:33 +02:00
compat Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c' 2013-08-22 13:09:24 +02:00
doc Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e' 2013-08-28 11:55:03 +02:00
libavcodec Merge commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0' 2013-08-28 12:28:25 +02:00
libavdevice lavd: Fix make checkheaders 2013-08-11 00:40:30 +02:00
libavfilter avfilter/vf_fps: Work around msvc (c99wrap) build failure 2013-08-26 15:23:45 +02:00
libavformat Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd' 2013-08-28 12:34:33 +02:00
libavresample Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
libavutil libavutil: cast truncated values to uint32_t 2013-08-27 14:25:34 +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 swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 2013-08-20 16:56:51 +02:00
libswscale swscale: improve dither checks 2013-08-19 18:33:50 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests matroskaenc: Fix writing TRACKDEFAULTFLAG 2013-08-27 14:00:31 +02:00
tools tools/graph2dot: fix use of deprecated *put_count 2013-08-25 19:37:37 +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 avcodec/mjpegdec: Read EXIF metadata in JPEG input. 2013-08-13 00:30:34 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: Filter non user AVOptions out from what can be set over the command line. 2013-08-28 00:25:13 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure configure: Add exif to CONFIG_EXTRA. 2013-08-21 19:00:48 +02:00
COPYING.GPLv2
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 CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg_filter: check that the input media type match the filter 2013-08-14 03:03:41 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.c Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding. 2013-08-18 22:00:35 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c ffplay: make next_nb_channels[] static const 2013-08-24 19:53:11 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
ffserver.c ffserver: allocate rc_eq, prevent freeing invalid pointer 2013-08-13 15:24:30 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
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: Add my GPG fingerprint 2013-08-23 21:40: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 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.