Go to file
Michael Niedermayer b52925d2cd Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'
* commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05':
  lavf: Add a protocol for SRTP encryption/decryption
  rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-15 16:05:34 +01:00
compat
doc Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d' 2013-01-15 15:57:33 +01:00
libavcodec Merge commit '47812070a267cbdf74164e154d03d99bf8ced100' 2013-01-15 15:51:14 +01:00
libavdevice Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1' 2013-01-14 14:16:21 +01:00
libavfilter Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de' 2013-01-14 14:43:32 +01:00
libavformat Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05' 2013-01-15 16:05:34 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-09 12:30:14 +01:00
libavutil Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d' 2013-01-15 15:57:33 +01:00
libpostproc
libswresample swr/dither: fix division by 0 2013-01-14 02:57:00 +01:00
libswscale
presets
tests Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8' 2013-01-13 13:54:52 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05' 2013-01-15 16:05:34 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak
configure Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668' 2013-01-15 15:23:20 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d' 2013-01-15 15:32:48 +01:00
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: fix sws_flags 2013-01-13 22:48:28 +01:00
ffprobe.c
ffserver.c
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.