1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer cdce0e8a50 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: make av_probe_input_buffer more robust

Conflicts:
	libavformat/utils.c

Not merged as it depends on previous buggy changes

See: e74cd2f470
See: ececbedaa8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-13 22:12:53 +01:00
compat compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
doc examples/muxing: simplify video PTS setting 2014-01-12 09:25:48 +01:00
libavcodec Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102' 2014-01-13 14:19:15 +01:00
libavdevice pulse: get latency only when needed 2014-01-05 18:44:18 +01:00
libavfilter Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24' 2014-01-10 03:46:28 +01:00
libavformat Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f' 2014-01-13 21:34:42 +01:00
libavresample Merge commit '99e20125232d40ea239a5b54d26bbfe526506114' 2014-01-13 14:36:55 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2014-01-11 03:08:10 +01:00
libpostproc
libswresample Avoid using empty macro arguments. 2013-12-31 12:19:59 +01:00
libswscale swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
presets
tests nut: Support XYZ12 rawvideo 2014-01-10 17:51:13 +01:00
tools tools/qt-faststart: add -movflags +faststart note 2014-01-07 10:59:04 -09:00
.gitignore
arch.mak
Changelog nut: Support XYZ12 rawvideo 2014-01-10 17:51:13 +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 Merge commit '99e20125232d40ea239a5b54d26bbfe526506114' 2014-01-13 14:36:55 +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.