Michael Niedermayer ca19862d38 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libxvid: remove disabled code
  qdm2: make a table static const
  qdm2: simplify bitstream reader setup for some subpacket types
  qdm2: use get_bits_left()
  build: Consistently handle conditional compilation for all optimization OBJS.
  avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
  msrle: convert MS RLE decoding function to bytestream2.
  x86inc improvements for 64-bit

Conflicts:
	common.mak
	libavcodec/avpacket.c
	libavcodec/bfi.c
	libavcodec/msrledec.c
	libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-13 00:39:19 +02:00
2012-04-13 00:14:06 +02:00
2011-06-12 18:01:29 +02:00
2012-04-11 14:10:21 +02:00
2012-04-11 14:10:21 +02:00
2012-01-25 22:47:45 +01:00
2012-04-08 00:02:21 +02:00
2011-04-08 02:50:13 +02:00
2012-02-23 19:36:16 +01:00
2012-03-19 00:19:13 +01:00
2012-04-06 10:23:26 +02:00

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.
Description
No description provided
Readme 241 MiB
Languages
C 91.6%
Assembly 6.4%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.2%