FFmpeg git repo
Go to file
Michael Niedermayer d7b20bfbb5 Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 14:00:44 +01:00
compat
doc doc/Makefile: rework component configuration logic 2012-11-29 10:19:52 +01:00
libavcodec Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
libavdevice
libavfilter lavfi/concat: prefer av_asprintf() over stack allocated buffer. 2012-11-29 12:55:56 +01:00
libavformat Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66' 2012-11-29 14:00:44 +01:00
libavresample Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
libavutil Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1' 2012-11-28 13:32:17 +01:00
libpostproc
libswresample
libswscale lsws: define version in SWScaler class 2012-11-29 10:20:21 +01:00
presets
tests Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: Enable avconv filter dependencies automatically 2012-11-27 17:05:01 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity 2012-11-28 21:39:50 +01:00
ffprobe.c
ffserver.c ffserver remove CONFIG_NOCUTILS check 2012-11-27 14:41:41 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
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.