1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Michael Niedermayer 2f9d6ffda7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  id3v2: remove pointless casts
  id3v2: read TXXX frames with two calls to decode_str() instead of one.
  id3v2: don't discard the whole tag when encountering empty frames.
  libvpx: fix build with older libvpx versions.
  ARM: check for inline asm 'y' operand modifier support

Conflicts:
	libavcodec/libvpxenc.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-04 03:24:59 +02:00
2011-10-02 15:21:12 +02:00
2011-09-26 22:04:23 +02:00
2011-06-12 18:01:29 +02:00
2011-10-03 23:43:22 +02:00
2011-09-19 17:39:38 +02:00
2011-09-29 21:44:03 +02:00
2011-09-19 07:04:17 +02:00
2011-04-08 02:50:13 +02:00
2011-09-26 02:28:21 +02:00
2011-10-03 00:38:50 +02:00
2011-09-19 07:04:17 +02:00
2011-10-03 23:32:22 +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.1%
Other 0.1%