FFmpeg git repo
Go to file
Michael Niedermayer 5c076205a6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  golomb: use unsigned arithmetics in svq3_get_ue_golomb()
  x86: float_dsp: fix loading of the len parameter on x86-32
  takdec: fix initialisation of LOCAL_ALIGNED array
  takdec: fix initialisation of LOCAL_ALIGNED array

Conflicts:
	libavcodec/rv30.c
	libavcodec/svq3.c
	libavcodec/takdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08 16:36:47 +01:00
compat
doc doc/filters: move volumedetect documentation below volume 2012-12-08 15:41:12 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-12-08 16:36:47 +01:00
libavdevice lavd/lavfi: fix float.h include. 2012-12-06 15:09:47 +01:00
libavfilter lavfi/version: remove unused dropped symbol 2012-12-08 16:04:09 +01:00
libavformat Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 2012-12-08 14:58:56 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2012-12-08 16:36:47 +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 tak: demuxer, parser, and decoder 2012-12-07 16:15:02 -05:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: add myself for my works 2012-12-08 15:18:08 +00:00
Makefile Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
README
RELEASE
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 2012-12-08 14:58:56 +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.