1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 00f25e0a99 Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'
* commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f':
  random_seed: Rewrite the generic clock() based seed code

Conflicts:
	libavutil/random_seed.c

See: 66531c75d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06 22:12:29 +01:00
compat compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
doc Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' 2014-01-05 22:12:41 +01:00
libavcodec avcodec/huffyuv: add YUVA420P, YUVA422P, YUVA444P, GBRAP, GRAY8A 2014-01-06 21:19:32 +01:00
libavdevice pulse: get latency only when needed 2014-01-05 18:44:18 +01:00
libavfilter drawtext: Drop pointless header 2014-01-06 11:44:10 +01:00
libavformat Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd' 2014-01-06 17:13:09 +01:00
libavresample Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2' 2014-01-04 02:30:07 +01:00
libavutil Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f' 2014-01-06 22:12:29 +01:00
libpostproc
libswresample Avoid using empty macro arguments. 2013-12-31 12:19:59 +01:00
libswscale swscale/arm: fix build error with --enable-shared 2013-12-28 14:28:25 +01:00
presets
tests Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122' 2014-01-06 13:24:48 +01:00
tools
.gitignore
arch.mak
Changelog Changelog: add nuts side & metadata support 2014-01-04 15:07:52 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c
cmdutils.c cmdutils: update copyright year to 2014. 2014-01-05 22:39:35 +02:00
cmdutils.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
common.mak
configure configure: Update freetype check to follow upstream 2014-01-06 11:44:10 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used 2014-01-03 02:24:27 +01:00
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: do not wait for the picture allocation to finish on exit 2013-12-29 13:19:19 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add myself for spdif* and hls.c 2014-01-03 15:05:48 +02:00
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.