FFmpeg git repo
Go to file
Michael Niedermayer 703e920bb7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: Work around non-standard wc implementations at more places
  fate: work around non-standard wc implementations
  x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
  ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16
  fate: use standard diff options
  tta: Fix comment about channel number; TTA supports >2 channels.
  avfilter: Move ff_get_ref_perms_string() to where it is used.
  build: Add 'check' target to run all compile and test targets.
  indeo3: validate new frame size before resetting decoder
  indeo3: when freeing buffers, set pointers referencing them to NULL as well
  indeo3: initialise pixel planes on allocation
  indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
  fate: rename psx-str-v3-mdec to mdec-v3
  fate: convert psx-str to a demuxer test
  lavf: add mdec to is_intra_only() list

Conflicts:
	doc/developer.texi
	libavcodec/indeo3.c
	libavfilter/video.c
	libavformat/utils.c
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/lavf-regression.sh
	tests/ref/vsynth1/cljr
	tests/ref/vsynth1/ffvhuff
	tests/ref/vsynth2/cljr
	tests/ref/vsynth2/ffvhuff

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-16 22:32:05 +02:00
doc lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
libavdevice lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
libavfilter lavfi/aevalsrc: correct the supported sample format 2012-05-16 16:17:41 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
libpostproc
libswresample libswresample-simd: Add ff_pack_6ch_float_to_int32_a_avx and ff_pack_6ch_float_to_int32_a_sse4 2012-05-13 20:56:18 +02:00
libswscale
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
tools lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure configure: check for pthread_cancel. 2012-05-14 19:32:43 +02:00
ffmpeg.c ffmpeg: affect computed filtered frame pts after filling frame from buffer 2012-05-14 23:40:46 +02:00
ffplay.c
ffprobe.c ffprobe: remove unused variable i in probe_file() 2012-05-16 13:20:21 +02:00
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.