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
2012-03-14 23:06:00 +01:00
2012-03-05 16:57:28 +01:00
2012-03-16 04:35:21 +01:00
2012-03-13 01:14:04 +01:00
2011-06-12 18:01:29 +02:00
2012-02-23 19:36:16 +01:00
2012-03-10 00:10:37 +01:00
2011-12-05 20:04:48 +01:00
2012-01-25 22:47:45 +01:00
2011-04-08 02:50:13 +02:00
2012-02-23 19:36:16 +01:00
2012-03-13 01:14:04 +01:00
2012-02-23 19:36:16 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.
Languages
C 90.1%
Assembly 8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%