FFmpeg git repo
Go to file
Michael Niedermayer 89c8eaa321 Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'
* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5':
  configure: arm: make _inline arch ext symbols depend on inline_asm
  arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation

Conflicts:
	configure
	libavcodec/arm/dca.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08 14:19:55 +01:00
compat
doc lavf: VobSub demuxer. 2012-12-07 21:18:06 +01:00
libavcodec Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5' 2012-12-08 14:19:55 +01:00
libavdevice lavd/lavfi: fix float.h include. 2012-12-06 15:09:47 +01:00
libavfilter lavfi/sendcmd: switch to filter_frame API 2012-12-08 12:10:40 +01:00
libavformat lavf: improve avoid_negative_ts help text 2012-12-08 13:30:43 +01:00
libavresample
libavutil Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5' 2012-12-08 14:19:55 +01:00
libpostproc
libswresample resample: remove disabled debug code 2012-12-06 02:51:26 +01:00
libswscale sws_scale: check input against NULL 2012-12-07 21:50:07 +01:00
presets
tests Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152' 2012-12-07 15:21:41 +01:00
tools
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavf: VobSub demuxer. 2012-12-07 21:18:06 +01:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5' 2012-12-08 14:19:55 +01:00
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
library.mak
version.sh

README

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.