1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer a614f892a6 Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
  lavd/pulse_audio_enc: implement pause messages
  lavd/pulse_audio_enc: implement volume messages
  lavd/avdevice: add volume messages
  lavd/pulse_audio_enc: add buffer fullness messages
  lavd/pulse_audio_enc: add nonblocking mode
  lavd/pulse_audio_enc: replace simple API with async API
  lavd/pulse_audio_enc: cosmetics
  lavd/pulse_audio_common: add context helper functions
  lavd/pulse_audio_common: rename variables and enums

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 04:57:23 +02:00
compat
doc DSD Stream File (DSF) demuxer 2014-04-18 03:25:58 +02:00
libavcodec x86/dsputil: use HADDD where applicable 2014-04-17 14:15:35 +02:00
libavdevice Merge remote-tracking branch 'lukaszmluki/master' 2014-04-18 04:57:23 +02:00
libavfilter Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432' 2014-04-17 05:15:26 +02:00
libavformat DSD Stream File (DSF) demuxer 2014-04-18 03:25:58 +02:00
libavresample Merge commit '21d8f4da91673051ad7055cf63d989488a56368e' 2014-04-17 21:07:25 +02:00
libavutil Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63' 2014-04-17 22:38:51 +02:00
libpostproc
libswresample swresample/resample_template: try to consider src_size more exactly 2014-04-15 06:35:35 +02:00
libswscale swscale/swscale: fix srcStride/srcSlice typo 2014-04-16 02:09:39 +02:00
presets
tests Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63' 2014-04-17 22:38:51 +02:00
tools
.gitignore
arch.mak
Changelog Direct Stream Digital (DSD) decoder 2014-04-15 20:35:57 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432' 2014-04-17 05:15:26 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix mixed merged & split side data with the stream->packet hack 2014-04-18 01:01:38 +02:00
ffmpeg.h
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: do not lose non ascii characters in non utf8 strings 2014-04-13 15:21:20 +02:00
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.