FFmpeg git repo
Go to file
Michael Niedermayer 43cce41267 Merge commit '0a75d1da23b8659ec49391469bb592da12760077'
* commit '0a75d1da23b8659ec49391469bb592da12760077':
  options_table: refs option is not snow-only
  random_seed: Support using CryptGenRandom on windows
  doc: update the faq entry about custom I/O

Conflicts:
	doc/faq.texi
	libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 14:15:33 +02:00
compat
doc Merge commit '0a75d1da23b8659ec49391469bb592da12760077' 2012-10-12 14:15:33 +02:00
libavcodec truemotion2: remove unreachable code 2012-10-12 11:54:38 +00:00
libavdevice Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter lavfi/ebur128: fix typo in condition. 2012-10-11 18:41:07 +02:00
libavformat rtmpproto: fix out of array write 2012-10-12 02:06:51 +02:00
libavresample
libavutil Merge commit '0a75d1da23b8659ec49391469bb592da12760077' 2012-10-12 14:15:33 +02:00
libpostproc
libswresample swri_resample_init: unsupported sample formats are an internal error. 2012-10-11 04:36:23 +02:00
libswscale yuv2rgb: fix declared array sizes, so they match actuals. 2012-10-11 18:20:24 +02:00
presets
tests Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
tools qt-faststart: fix printf argument type 2012-10-10 18:50:56 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a' 2012-10-10 13:18:05 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
cmdutils_common_opts.h
common.mak
configure Merge commit '0a75d1da23b8659ec49391469bb592da12760077' 2012-10-12 14:15:33 +02:00
ffmpeg.c Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffmpeg.h Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffmpeg_filter.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffmpeg_opt.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
ffplay.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
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.