1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 7ef8d97b1a Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 18:21:10 +01:00
compat
doc udp: try to clarify verbiage on buffer_size 2014-03-22 16:46:06 +01:00
libavcodec avcodec/snowenc: make snow non experimental 2014-03-22 16:52:51 +01:00
libavdevice dshow: use distinct buffers per stream. 2014-03-22 03:46:10 +01:00
libavfilter Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da' 2014-03-22 18:21:10 +01:00
libavformat avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough 2014-03-22 16:40:46 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2014-03-20 12:53:41 +01:00
libpostproc Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported. 2014-03-18 23:39:30 +01:00
libswresample swresample: add swri_resample_float_sse 2014-03-20 06:01:06 +01:00
libswscale Add APIchanges entry and bump libswscale micro version for making gray16 full-scale. 2014-03-19 09:11:22 +01:00
presets
tests fate: add cine demux test 2014-03-22 17:50:02 +01:00
tools
.gitignore
arch.mak
Changelog Changelog: move post 2.2 branching entries out of the 2.2 changelog 2014-03-16 19:15:58 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure configure: Try to fix detection of ARM Compiler 5.04 2014-03-21 17:51:16 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont call exit_program() from a signal hander 2014-03-21 17:09:56 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add myself az mpegts demuxer maintainer 2014-03-18 02:05:44 +01:00
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.