1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer ec8e68c763 Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07 23:05:26 +01:00
compat Fix compilation with os2threads 2013-11-07 20:46:44 +01:00
doc doc/muxers: document animated GIF muxer. 2013-11-07 20:30:43 +01:00
libavcodec avcodec/libfdk-aacdec: remove redundant log messages 2013-11-07 14:55:35 +00:00
libavdevice lavd/pulse: add ff_ prefix and fix param type 2013-11-04 00:47:00 +01:00
libavfilter Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c' 2013-11-07 23:05:26 +01:00
libavformat avformat/mpegvideodec: check seq headers more completely during probing 2013-11-07 20:39:08 +01:00
libavresample
libavutil avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++ 2013-11-05 22:10:02 +01:00
libpostproc
libswresample
libswscale lsws/utils: introduce scale_algorithms array 2013-11-05 14:01:53 +01:00
presets
tests
tools graph2dot: Add missing #include for av_get_channel_layout_string() 2013-11-04 23:04:10 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-11-05 21:58:44 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: add verbose consistency checks in case of filtering inconsistent options 2013-11-03 18:05:43 +01:00
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: add smarter method for determining video picture duration 2013-11-05 21:27:07 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add vp9 maintainers 2013-11-03 14:45:18 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-11-04 01:20:46 +01:00
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.