Go to file
Michael Niedermayer 4a59994e03 Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'
* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
  doc: fix a couple of typos in frame.h

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04 21:55:16 +01:00
compat
doc lavd/avdevice: add device iterators 2014-03-03 23:39:07 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-03-04 15:09:58 +01:00
libavdevice lavd/avdevice: add device iterators 2014-03-03 23:39:07 +01:00
libavfilter Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e' 2014-03-04 13:17:25 +01:00
libavformat avformat/mpegtsenc: fix HEVC MPEG TS stream type 2014-03-04 15:44:04 +01:00
libavresample
libavutil Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54' 2014-03-04 21:55:16 +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
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak
Changelog update for 2.2 2014-03-01 03:34:59 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure vf_frei0r: refactor library loading from env variable 2014-03-04 11:39:02 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +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 update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
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.