FFmpeg git repo
Go to file
Michael Niedermayer 30aa9b727d Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
	libavformat/rtsp.c

See: 0079232299
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-12 19:37:46 +01:00
compat
doc Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671' 2013-12-12 00:32:15 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-12-12 13:02:20 +01:00
libavdevice
libavfilter avfilter/aeval: Fix use of uninitialized variable 2013-12-11 15:31:32 +01:00
libavformat Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39' 2013-12-12 19:37:46 +01:00
libavresample
libavutil Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5' 2013-12-12 19:12:33 +01:00
libpostproc postproc: fix null pointer dereference with invalid option strings 2013-12-11 22:28:42 +01:00
libswresample
libswscale
presets
tests
tools tools/probetest: Check av_realloc() return code 2013-12-11 22:29:22 +01:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26' 2013-12-11 22:52:28 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit '674fa49110a661694188a958be13d529b7c8c5dd' 2013-12-11 23:36:10 +01:00
ffmpeg.h
ffplay.c Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4' 2013-12-11 23:49:44 +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.