1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 5333e0dd66 Merge commit '57b1eb9f75b04571063ddec316e290c216c114ac'
* commit '57b1eb9f75b04571063ddec316e290c216c114ac':
  dcadsp: scan coefficients linearly in dca_lfe_fir

Conflicts:
	libavcodec/dcadsp.c

See: 9ae8e23188
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28 19:40:40 +01:00
compat
doc Merge remote-tracking branch 'qatar/master' 2014-02-26 11:27:02 +01:00
libavcodec Merge commit '57b1eb9f75b04571063ddec316e290c216c114ac' 2014-02-28 19:40:40 +01:00
libavdevice Add more Bayer colour spaces to the video4linux2 device wrapper. 2014-02-23 13:42:41 +01:00
libavfilter lavfi/frei0r: factorize plugin loading with static path 2014-02-26 22:48:37 +01:00
libavformat lavf/ftp: fix seek to nagative position 2014-02-28 00:07:31 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil lavu/buffer: add release function 2014-02-25 01:38:52 +01:00
libpostproc
libswresample swr: check that the context for swr_convert() has been initialized 2014-02-24 08:23:42 +01:00
libswscale libswscale: bayer to rgb24 & yv12 colorspace converters 2014-02-23 02:38:22 +01:00
presets
tests avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used 2014-02-22 22:39:50 +01:00
tools
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak
Changelog lavfi: add compand audio filter 2014-02-26 08:09:58 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
configure af_compand: add a dependency on strtok_r 2014-02-26 21:59:14 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check 2014-02-25 00:05:37 +01:00
ffmpeg_vdpau.c
ffmpeg.c Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 2014-02-24 21:08:19 +01:00
ffmpeg.h Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 2014-02-24 21:08:19 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE
MAINTAINERS MAINTAINERS: add myself as vf_dejudder.c maintainer 2014-02-17 03:13:55 +01:00
Makefile
README
RELEASE Prepare for 10_beta1 Release 2014-02-15 16:49:04 -05:00
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.