FFmpeg git repo
Go to file
Michael Niedermayer be74cb5159 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 12:17:35 +01:00
compat
doc Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212' 2013-11-04 21:26:34 +01:00
libavcodec Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a' 2013-11-05 11:14:29 +01:00
libavdevice lavd/pulse: add ff_ prefix and fix param type 2013-11-04 00:47:00 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-11-05 12:17:35 +01:00
libavformat avformat/http: print http headers at AV_LOG_DEBUG level 2013-11-05 01:38:08 +01:00
libavresample
libavutil Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212' 2013-11-04 21:26:34 +01:00
libpostproc
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale lsws/utils: fix typo 2013-11-05 00:04:17 +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 Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' 2013-11-03 11:54:19 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-11-02 10:38:03 +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
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.