ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 06:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,676 Commits 36 Branches 398 Tags 535 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
e6e71fd7b5
Go to file
Michael Niedermayer e6e71fd7b5 Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c' 
* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858f6
See: 973a758f52
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 09:33:28 +02:00
compat
doc Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c' 2013-09-27 09:33:28 +02:00
libavcodec avcodec/parser: reset indexes on realloc failure 2013-09-26 21:03:48 +02:00
libavdevice avdevice/v4l: remove duplicate include 2013-09-21 15:36:33 +02:00
libavfilter lavfi/dualinput: reimplement on top of framesync. 2013-09-23 09:50:09 +02:00
libavformat Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c' 2013-09-27 09:33:28 +02:00
libavresample
libavutil pixdesc: fix NV20* descriptors 2013-09-24 14:02:10 +02:00
libpostproc
libswresample
libswscale swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1 2013-09-19 23:15:51 +02:00
presets
tests avcodec/mjpegenc: dont store DQT for LJPEG 2013-09-24 01:21:03 +02:00
tools ffhash: Change size to an int 2013-09-24 16:29:18 +02:00
.gitignore
arch.mak
Changelog avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe' 2013-09-24 14:35:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: fix uninitialized variable warning 2013-09-23 14:16:34 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS lavf/libssh: add MAINTAINERS entry 2013-09-21 16:35:41 +02:00
Makefile
README
RELEASE
version.sh

README 

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.