1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 0500623d58 Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
  lavfi/dualinput: fix shortest option.
  lavfi/vf_tile: use av_make_q.
  lavfi/avf_concat: use av_make_q.
  lavfi/af_amerge: use av_make_q.
  lavu/rational: add syntactic sugar.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 17:48:07 +01:00
compat compat: provide va_copy for old gcc versions. 2013-12-30 12:38:03 +01:00
doc lavu/rational: add syntactic sugar. 2014-01-19 17:12:22 +01:00
libavcodec avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated 2014-01-19 17:30:22 +01:00
libavdevice pulse: get latency only when needed 2014-01-05 18:44:18 +01:00
libavfilter lavfi/dualinput: fix shortest option. 2014-01-19 17:13:36 +01:00
libavformat avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely 2014-01-17 23:09:52 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-01-15 15:49:22 +01:00
libavutil lavu/rational: add syntactic sugar. 2014-01-19 17:12:22 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample swresample: Add arm&x86 clobber tests 2014-01-18 18:38:57 +01:00
libswscale Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7' 2014-01-14 14:44:59 +01:00
presets
tests fate: add WebP Exif metadata test 2014-01-15 21:20:47 +01:00
tools Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928' 2014-01-17 14:38:33 +01:00
.gitignore Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
arch.mak
Changelog webp: fix capitalization of the word Exif 2014-01-15 02:54:36 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.c Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
common.mak common.mak: Less ugly version of the previous windres fix 2013-12-09 02:47:55 +01:00
configure swresample: Add arm&x86 clobber tests 2014-01-18 18:38:57 +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: change ost->finished to an enum 2014-01-17 23:57:02 +01:00
ffmpeg.h ffmpeg: change ost->finished to an enum 2014-01-17 23:57:02 +01:00
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 ffserver: extend report_config_error() facilities, and use it for warnings 2013-12-16 19:19:04 +01:00
INSTALL
library.mak Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
LICENSE Change license of yadif from GPL to LGPL 2014-01-14 14:19:15 +01:00
MAINTAINERS MAINTAINERS: add myself for spdif* and hls.c 2014-01-03 15:05:48 +02:00
Makefile cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
README
RELEASE Prepare for 10_alpha2 Release 2014-01-18 10:27:27 -05:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.