1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 8a91da9575 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: K&R formatting cosmetics
  s3tc.h: Add missing #include to fix standalone header compilation.
  FATE: add capability for audio encode/decode tests with fuzzy psnr comparison
  FATE: allow a tolerance in the size comparison in do_tiny_psnr()
  FATE: use absolute difference from a target value in do_tiny_psnr()
  FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
  FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-17 04:43:12 +01:00
doc docs: Add examples for -cpuflags 2012-03-14 23:06:00 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-17 04:43:12 +01:00
libavdevice alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
libavfilter ass: fix DAR calculation. 2012-03-16 04:35:21 +01:00
libavformat matroskadec: Fix null pointer exception on corrupted input. 2012-03-16 05:28:18 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-17 04:43:12 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore Remove libpostproc. 2012-02-23 19:36:16 +01:00
Changelog lavfi: port MP swapuv filter 2012-03-10 00:10:37 +01:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.c cmdutils: Fix cpuflags so the flags dont pull in and out other flags. 2012-03-14 23:05:38 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: allow selective and complete disabling of map_metadata. 2012-03-17 03:16:09 +01:00
ffplay.c ffplay: force video refresh if the window is resized or damaged 2012-03-15 00:58:13 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input. 2012-03-12 03:31:59 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
Makefile Remove libpostproc. 2012-02-23 19:36:16 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.