1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
Michael Niedermayer 76f8d3c8d9 Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 13:19:00 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Improve dump_attachment documentation. 2013-02-28 08:57:10 +01:00
libavcodec Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174' 2013-03-01 13:19:00 +01:00
libavdevice avformat/lavfi: force probesize to cover at least 30 frames 2013-02-28 20:28:59 +01:00
libavfilter lavfi/af_aresample: fix info log for unknown layouts. 2013-02-28 19:23:12 +01:00
libavformat lavf/avio: check for : in filenames for protocols. 2013-02-28 19:30:56 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174' 2013-03-01 13:19:00 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: make the default of nopts for first_pts actually work 2013-02-25 04:39:26 +01:00
libswscale swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB 2013-02-27 09:51:43 -05:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-02-28 13:13:04 +01:00
tools Include fix for building ismindex under MinGW 2013-02-27 10:13:09 -07:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog blend filter 2013-02-21 20:16:23 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a' 2013-03-01 12:48:55 +01:00
cmdutils.h ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure build: make iconv build configurable. 2013-02-28 01:23:24 +01: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 ffmpeg: Force a first_pts of 0 for the first configuration of -async use 2013-02-25 04:39:26 +01:00
ffmpeg_opt.c Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311' 2013-03-01 12:57:17 +01:00
ffmpeg.c Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311' 2013-03-01 12:57:17 +01:00
ffmpeg.h ffmpeg_opt: add -to option to specify stop time 2013-02-27 02:17:42 +01:00
ffplay.c ffplay: do not cycle through unavailable show modes 2013-02-27 21:34:13 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
LICENSE Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3' 2013-02-28 12:49:25 +01:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.