1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer af539319af Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
  smacker: Free memory properly if the init function fails

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 12:57:58 +02:00
compat
doc Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c' 2013-09-11 12:42:11 +02:00
libavcodec Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd' 2013-09-12 12:57:58 +02:00
libavdevice lavd/v4l2: Improve debug message 2013-09-08 14:30:52 +02:00
libavfilter avfilter: remove redundant use of AV_NE() macro 2013-09-11 15:05:21 +00:00
libavformat Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14' 2013-09-12 11:39:18 +02:00
libavresample
libavutil lavu/sha512: Fully unroll the transform function loops 2013-09-11 21:55:59 +02:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2013-09-11 12:51:01 +02:00
presets
tests Merge commit 'c58f4069e1d5b5804c669b691510e1b8fabb67fc' 2013-09-11 12:31:51 +02:00
tools tools/crypto_bench: fix 2 typos. 2013-09-04 21:59:34 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak
Changelog lavfi: Weston 3 Field Deinterlacing Filter 2013-09-06 12:46:56 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: Fix wrong reference to user support mailing list 2013-09-11 14:49:56 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend" 2013-09-10 14:13:44 +02:00
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: show bitmap subtitles size. 2013-09-04 16:36:28 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
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.