1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 6b06f9f1bc Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
  af_volume: preserve frame properties

Conflicts:
	libavfilter/af_volume.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 22:13:42 +01:00
compat
doc avformat/options_table: add named constants for avoid_negative_ts 2014-02-24 19:46:11 +01:00
libavcodec libx265: Use proper error code 2014-02-24 11:10:23 -05:00
libavdevice Add more Bayer colour spaces to the video4linux2 device wrapper. 2014-02-23 13:42:41 +01:00
libavfilter Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f' 2014-02-24 22:13:42 +01:00
libavformat avformat/options_table: add named constants for avoid_negative_ts 2014-02-24 19:46:11 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil avutil/frame_copy_audio: also check that channels match 2014-02-24 10:12:33 +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 '294a51e18ab7df4d658249361a03f0d716a4e9f0' 2014-02-19 14:33:22 +01:00
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure libx265: Update API usage 2014-02-24 11:09:30 -05:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1' 2014-02-24 09:15:46 +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
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.