1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 2ad28840b3 Merge commit '538bf767373f176b6487e30181155e74b37cced6'
* commit '538bf767373f176b6487e30181155e74b37cced6':
  avconv: make -aspect work with streamcopy

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 08:52:03 +02:00
compat Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
doc lavfi: add haldclut filter. 2013-05-27 20:42:28 +02:00
libavcodec Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d' 2013-05-28 07:49:38 +02:00
libavdevice
libavfilter lavfi/haldclutsrc: 10l remove size options. 2013-05-27 20:53:25 +02:00
libavformat Merge commit '564b7e0c0095768cd20001b28154d69462be54e7' 2013-05-28 08:04:02 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-27 08:55:24 +02:00
libpostproc
libswresample
libswscale
presets
tests j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt 2013-05-27 21:54:07 +02:00
tools
.gitignore
arch.mak
Changelog lavfi: add haldclut filter. 2013-05-27 20:42:28 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-05-25 21:43:13 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit '538bf767373f176b6487e30181155e74b37cced6' 2013-05-28 08:52:03 +02:00
ffmpeg.h
ffplay.c ffplay: dont forget passing lowres to private options 2013-05-28 00:09:34 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +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.