Go to file
Michael Niedermayer 4835332537 Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'
* commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9':
  rtsp: Support multicast source filters (RFC 4570)
  rtpproto: Check the source IP if one single source has been specified
  rtpproto: Support IGMPv3 source specific multicast inclusion

Conflicts:
	libavformat/rtpproto.c
	libavformat/rtsp.c
	libavformat/rtsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-20 10:39:53 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc doc/filters: add sepia example for colorchannelmixer 2013-07-19 19:36:37 +00:00
libavcodec jpeg2000dec: silence unused variable warning 2013-07-19 17:54:57 +02:00
libavdevice
libavfilter avfilter/vf_separatefields: fix ;; 2013-07-20 00:44:09 +02:00
libavformat Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9' 2013-07-20 10:39:53 +02:00
libavresample
libavutil avutil/softfloat: remove unneeded include assert.h 2013-07-19 18:56:33 +02:00
libpostproc
libswresample
libswscale swscale: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
presets
tests tests/tiny_psnr: remove unneeded include assert.h 2013-07-19 18:55:49 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: use start_time as next audio pts on flush when seeking is not supported 2013-07-20 02:32:43 +02:00
ffprobe.c
ffserver.c Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
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.