1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Go to file
Michael Niedermayer ca1f2b3e10 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
  x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
  id3v2: add a mimetype for bmp pictures.
  flacdec: be less strict when parsing attached pictures.
  flacdec: don't create an attached picture stream until we have all information.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-08 22:33:32 +02:00
2012-07-08 19:54:08 +02:00
2012-07-08 17:59:56 +02:00
2012-07-08 17:59:56 +02:00
2012-07-07 01:41:55 +00:00
2011-06-12 18:01:29 +02:00
2012-05-04 18:40:36 +02:00
2012-07-08 13:41:39 +02:00
2012-07-08 19:54:08 +02:00
2012-01-25 22:47:45 +01:00
2012-07-06 17:08:22 +02:00
2011-04-08 02:50:13 +02:00
2012-02-23 19:36:16 +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.
Languages
C 90.1%
Assembly 7.9%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%