FFmpeg git repo
Go to file
Michael Niedermayer 75f847aa6b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avplay: use libavresample for sample format conversion and channel mixing
  Fix compilation with YASM/NASM without AVX support.
  WMAL: do not output last frame again if nothing was decoded in current packet
  WMAL: do not start decoding if frame does not end in current packet
  adpcm-thp: fix invalid array indexing
  ppc: add const where needed in scalarproduct_int16_altivec()
  ppc: remove shift parameter from scalarproduct_int16_altivec()
  ppc: dsputil: do unaligned block accesses correctly
  dvenc: do not call dsputil functions with stride not a multiple of 16
  APIchanges: fill in some dates and commit hashes

Conflicts:
	doc/APIchanges
	ffplay.c
	libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-01 22:06:55 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-05-01 22:06:55 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-05-01 22:06:55 +02:00
libavdevice
libavfilter lavfi/lut: remove unused variable 2012-05-01 01:24:48 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-30 22:18:43 +02:00
libavresample Fix compilation with YASM/NASM without AVX support. 2012-05-01 13:37:25 -04:00
libavutil lavu/opt: clarify error message in set_key_value_pair() 2012-04-30 23:04:46 +02:00
libpostproc
libswresample swr: add and use function pointers for rematrix 2012-05-01 20:20:21 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-04-24 02:30:41 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-04-26 22:24:58 +02:00
tools
.gitignore Merge remote-tracking branch 'qatar/master' 2012-04-27 22:44:52 +02:00
arch.mak
Changelog lavc: add MicroDVD decoder. 2012-04-27 19:39:19 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps() 2012-04-30 18:31:06 +02:00
cmdutils.h
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: fix type of dither scale. 2012-05-01 20:13:32 +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
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
README
RELEASE
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.