FFmpeg git repo
Go to file
Michael Niedermayer b41d481aa4 common.mak: add forgotten hunk from last merge
Found-by: jamal <jamrial@gmail.com>
Author of the hunk: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09 03:50:48 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
libavcodec aasc: 8bit support 2012-08-09 00:02:05 +00:00
libavdevice lavd/x11grab: deprecate "nomouse" specification in filename 2012-08-08 23:43:37 +02:00
libavfilter lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
libavutil integer: switch to av_assert 2012-08-09 01:44:15 +02:00
libpostproc pp: check that the argument is not NULL as this is not supported 2012-07-07 19:14:21 +02:00
libswresample bessel: check that the function terminates as expected by av_assert2(). 2012-08-09 01:44:15 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
mt-work Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
presets
tests Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
tools Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak
Changelog lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
cmdutils_common_opts.h
cmdutils.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cmdutils.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
common.mak common.mak: add forgotten hunk from last merge 2012-08-09 03:50:48 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
ffplay.c ffplay: fix warning that i just mistakenly introduced 2012-07-20 03:47:11 +02:00
ffprobe.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ffserver.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE LICENSE: Document all GPL files 2012-08-04 04:03:08 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
README
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
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.