1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer f1b15c1ef9 Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc'
* commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc':
  alac: Check that the channels fit at the given offset

Conflicts:
	libavcodec/alac.c

See: b53f89710b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 13:02:08 +02:00
compat
doc lavfi/drawtext: add generic timeline interface and deprecate "draw". 2013-09-03 21:12:15 +02:00
libavcodec Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc' 2013-09-04 13:02:08 +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
libavutil avutil/fifo: assert that theres enough data in the fifo on drain calls. 2013-09-03 03:11:35 +02:00
libpostproc
libswresample
libswscale
presets
tests fate: Force diff into text mode 2013-09-04 01:02:06 +02:00
tools
.gitignore
arch.mak
Changelog lavfi: port phase filter from libmpcodecs 2013-09-03 14:05:38 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: show probe_score in the format section 2013-09-01 11:34:18 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
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.