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 Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 2012-11-28 13:27:18 +01:00
libavutil Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5' 2012-12-08 14:19:55 +01:00
libpostproc pp: add SSE2 deInterlaceInterpolateCubic(). 2012-11-18 16:21:59 +01:00
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 Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.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 lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS
Makefile Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
README
RELEASE
arch.mak
cmdutils.c Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 2012-12-05 15:58:07 +01:00
cmdutils.h
cmdutils_common_opts.h
common.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
configure Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5' 2012-12-08 14:19:55 +01:00
ffmpeg.c ffmpeg: small indent fix. 2012-12-04 16:40:11 +01:00
ffmpeg.h ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg_filter.c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
ffmpeg_opt.c ffmpeg: use avformat_seek_file() instead of av_seek_frame(). 2012-12-02 00:06:02 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-11-29 14:22:58 +01:00
ffprobe.c ffprobe: free dictionary in opt_show_entries() 2012-11-23 18:49:26 +01:00
ffserver.c ffserver remove CONFIG_NOCUTILS check 2012-11-27 14:41:41 +01:00
library.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
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.