1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer e7d924da30 Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'
* commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a':
  lavf: fix arithmetic overflows in avformat_seek_file()
  mjpeg: initialize input padding after unescaped buffer to zero

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09 13:56:46 +01:00
compat
doc Merge commit '18e6f087c4a50bede8449ee164778945480be50c' 2012-12-09 13:35:49 +01:00
libavcodec Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a' 2012-12-09 13:56:46 +01:00
libavdevice dshow: fix return code when opening device 2012-12-08 21:44:30 +01:00
libavfilter lavfi/setfield: add support to named options and introspection 2012-12-08 18:26:32 +01:00
libavformat Merge commit '18e6f087c4a50bede8449ee164778945480be50c' 2012-12-09 13:35:49 +01:00
libavresample
libavutil lavu/opt: change the way ranges are printed 2012-12-08 22:18:38 +01:00
libpostproc
libswresample
libswscale sws_scale: check input against NULL 2012-12-07 21:50:07 +01:00
presets
tests Flip zerocodec output. 2012-12-09 10:24:16 +01:00
tools
.gitignore
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog tak: demuxer, parser, and decoder 2012-12-07 16:15:02 -05:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 2012-12-08 14:58:56 +01: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
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add myself for my works 2012-12-08 15:18:08 +00:00
Makefile Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
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.