1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 17049bff64 Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'
* commit 'adc09136a4a63b152630abeacb22c56541eacf60':
  xwma: Avoid division by zero

Conflicts:
	libavformat/xwma.c

See: a3cb7f992f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 22:59:49 +02:00
compat
doc doc/demuxers: fix image2 examples 2013-09-29 16:36:25 +00:00
libavcodec avcodec/tiff_common: fix bprint max sizes 2013-09-29 21:28:22 +02:00
libavdevice avdevice/v4l: remove duplicate include 2013-09-21 15:36:33 +02:00
libavfilter avfilter/vf_rotate: use vsub for output plane height calculation 2013-09-29 19:24:27 +00:00
libavformat Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60' 2013-09-29 22:59:49 +02:00
libavresample
libavutil Merge commit '38e15df1489d86c016515223ee693e7d0326c56a' 2013-09-28 10:47:43 +02:00
libpostproc
libswresample swresample: replace 2 av_free() by av_freep() 2013-09-16 22:44:15 +02:00
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/tiff_common: fix bprint max sizes 2013-09-29 21:28:22 +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 avfilter: port pullup filter from libmpcodecs 2013-09-17 17:03:36 +00:00
MAINTAINERS lavf/libssh: add MAINTAINERS entry 2013-09-21 16:35:41 +02:00
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.