1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Michael Niedermayer 9bb86faca7 Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'
* commit '3185a80259ce1f8f8111073dbd14a69a396e03a3':
  fraps: Make the input buffer size checks more strict

Conflicts:
	libavcodec/fraps.c

The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 14:21:34 +02:00
compat
doc doc: Add missing hashes and dates to APIChanges 2013-09-19 16:57:48 +00:00
libavcodec Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3' 2013-09-20 14:21:34 +02:00
libavdevice
libavfilter avfilter/vf_decimate: add gray16 and yuv440p 2013-09-19 17:53:05 +00:00
libavformat Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5' 2013-09-20 12:37:24 +02:00
libavresample
libavutil avutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning 2013-09-19 22:46:52 +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
tools
.gitignore
arch.mak
Changelog Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5' 2013-09-20 12:06:15 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
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.