1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer bc7f76377c Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'
* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c':
  dcadec: set the output channel mode more accurately.

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05 22:27:34 +01:00
compat
doc Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' 2014-01-05 22:12:41 +01:00
libavcodec Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c' 2014-01-05 22:27:34 +01:00
libavdevice pulse: get latency only when needed 2014-01-05 18:44:18 +01:00
libavfilter avfilter/vf_format: check that the format list is not empty 2014-01-05 20:14:03 +01:00
libavformat avformat/nutdec: remove unused variable 2014-01-05 17:27:23 +01:00
libavresample Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2' 2014-01-04 02:30:07 +01:00
libavutil Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' 2014-01-05 22:12:41 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a' 2014-01-05 02:37:22 +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
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2014-01-05 13:29:44 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
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.