FFmpeg git repo
Go to file
Michael Niedermayer 2330eb1474 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  arm: intreadwrite: disable inline asm for gcc 4.7 and later
  arm: intreadwrite: fix inline asm constraints for gcc 4.6 and later
  indeo3: fix motion vector validation
  pcm_bluray: set bits_per_raw_sample for > 16-bit
  twinvq: fix out of bounds array access
  lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type

Conflicts:
	doc/APIchanges
	libavcodec/indeo3.c
	libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-02 21:12:34 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-05-02 21:12:34 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-05-02 21:12:34 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
libavfilter lavfi: remove screenshot libmpcodecs wrapper 2012-05-02 18:15:29 +02:00
libavformat flvdec: pass on proper error value. 2012-05-01 23:20:52 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-02 21:12:34 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-05-02 21:12:34 +02:00
libpostproc
libswresample swr: automatically choose s16/flt/dbl to preserve input precision unless user overrides. 2012-05-02 01:12:16 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-04-24 02:30:41 +02:00
mt-work
presets
tests fate: update mmf seek checksum, change caused by av_get_packet() useage 2012-05-02 01:55:04 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-04-27 22:44:52 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog lavc: add MicroDVD decoder. 2012-04-27 19:39:19 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps() 2012-04-30 18:31:06 +02:00
cmdutils.h Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-04-26 22:24:58 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: preserve NULL ptrs in get_buffer() 2012-05-02 10:48:28 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-05-01 22:06:55 +02:00
ffprobe.c ffprobe: do not try to decode empty packets. 2012-04-21 14:02:08 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +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.