1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 3eeca8b0e4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegvideo: Avoid 32-bit wrapping of linesize multiplications

This is not merged as its not correct for ffmpeg and would introduce a
security issue if merged as is.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 14:19:22 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748' 2013-09-04 14:06:46 +02:00
libavcodec Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9' 2013-09-04 13:06:24 +02:00
libavdevice Read h264 headers from v4l2 to allow stream-copying. 2013-09-01 21:27:43 +02:00
libavfilter lavfi/mptestsrc: use outlink->frame_count 2013-09-03 20:15:46 +00:00
libavformat Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e' 2013-09-04 12:20:53 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil Merge commit 'b4ec7a5fee644ad9882e10c097817b65447b8e55' 2013-09-04 13:57:01 +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 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: Force diff into text mode 2013-09-04 01:02:06 +02:00
tools Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00: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 lavfi: port phase filter from libmpcodecs 2013-09-03 14:05:38 +00:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: silence warning about incompatible pointer types 2013-08-30 12:41:36 +00: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 Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d' 2013-09-04 13:15:22 +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 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: show probe_score in the format section 2013-09-01 11:34:18 +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/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +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.