1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer c7b0a84e1f Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'
* commit '62549f9655c48f0ec061087fa33a96040ce01145':
  lavfi: error out when options are provided to a filter that does not take any

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 10:34:05 +02:00
compat
doc Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1' 2013-04-11 10:02:07 +02:00
libavcodec Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525' 2013-04-10 12:41:06 +02:00
libavdevice
libavfilter Merge commit '62549f9655c48f0ec061087fa33a96040ce01145' 2013-04-11 10:34:05 +02:00
libavformat lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
libavresample
libavutil avutil/opencl: add opencl device list APIs 20130411 2013-04-11 03:48:57 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample
libswscale Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
presets
tests Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a' 2013-04-11 02:10:12 +02:00
tools Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak
Changelog lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: remove error message from opt_default() in case of missing option 2013-04-05 10:48:32 +02:00
cmdutils.h
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffmpeg.c ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
ffmpeg.h ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffplay.c ffplay: simplify video pts calculation 2013-04-08 22:21:45 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
README
RELEASE
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.