FFmpeg git repo
Go to file
Michael Niedermayer 0bb474f686 Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

See: 59003fe7c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 13:47:08 +01:00
compat
doc update for 2.2 2014-03-01 03:34:59 +01:00
libavcodec Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870' 2014-03-01 13:26:51 +01:00
libavdevice Add more Bayer colour spaces to the video4linux2 device wrapper. 2014-02-23 13:42:41 +01:00
libavfilter af_compand: replace strtok_r() with av_get_token() 2014-02-28 21:55:46 +01:00
libavformat avformat/ac3dec: Use avpriv_ac3_parse_header2() 2014-03-01 01:56:25 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil avutil/opt: allow max=min=0 for pixel formats 2014-03-01 00:31:38 +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 Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f' 2014-03-01 13:47:08 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog update for 2.2 2014-03-01 03:34:59 +01:00
INSTALL
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak
configure Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810' 2014-03-01 13:07:36 +01:00
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
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
ffplay.c
ffprobe.c
ffserver.c
library.mak
version.sh

README

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.