1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Michael Niedermayer 7876f14f8b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pthread: add some malloc failure checks
  avconv: cosmetics, reformat transcode_init()
  avconv: rename 'os' variable to 'oc'
  doc/filters: fix some typos.
  configure: add libpulse to help output

Conflicts:
	avconv.c
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 02:54:50 +01:00
2011-11-21 23:52:23 +01:00
2011-11-20 15:03:32 +01:00
2011-10-30 18:11:09 +01:00
2011-06-12 18:01:29 +02:00
2011-09-19 17:39:38 +02:00
2011-10-22 20:49:24 +02:00
2011-11-11 04:25:53 +01:00
2011-04-08 02:50:13 +02:00
2011-09-26 02:28:21 +02:00
2011-10-22 20:49:24 +02:00

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

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

* Read the documentation in the doc/ directory.

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

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