1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 61301ca786 Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28 12:28:23 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
libavcodec Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362' 2014-05-28 12:20:12 +02:00
libavdevice
libavfilter avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB 2014-05-27 18:22:09 +02:00
libavformat Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c' 2014-05-28 12:28:23 +02:00
libavresample
libavutil Timecode: Support 48fps 2014-05-28 03:25:41 +02:00
libpostproc
libswresample
libswscale
presets
tests avformat/oggenc: fix EOS flag 2014-05-28 01:12:18 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c
cmdutils.c ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
common.mak
configure Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c' 2014-05-28 00:03:59 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: use thread message API. 2014-05-26 11:40:21 +02:00
ffmpeg.h ffmpeg: use thread message API. 2014-05-26 11:40:21 +02:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add Trac maintainers 2014-05-26 12:18:29 -08: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.