No description
Find a file
Michael Niedermayer cd25412f59 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  http: Allow setting a Content-Type for POST requests

Conflicts:
	libavformat/http.c

See: c01d1d4ddf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:53:54 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge remote-tracking branch 'qatar/master' 2014-03-12 04:53:54 +01:00
libavcodec avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known 2014-03-11 20:45:29 +01:00
libavdevice Merge remote-tracking branch 'cigaes/master' 2014-03-08 15:00:36 +01:00
libavfilter lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2014-03-12 04:53:54 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2014-03-09 15:37:35 +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 Add fieldmatch test 2014-03-10 02:59:01 +01:00
tools Merge commit 'ea7f79f937' 2014-03-01 14:44:58 +01:00
.gitignore Merge commit 'e7dfaf16a4' 2014-02-25 20:26:00 +01:00
arch.mak
Changelog lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak Merge commit 'b339182eba' 2014-02-17 02:22:01 +01:00
configure Merge commit '390acbea06' 2014-03-12 02:22:16 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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 '67f2a68814' 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 ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak Merge commit 'b339182eba' 2014-02-17 02:22:01 +01:00
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.