1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Michael Niedermayer 198e10b55c Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'
* commit '68e57cde68f3da4c557ca15491fda74d1ea6321e':
  ac3dec: Increment channel pointers only once per channel

Conflicts:
	libavcodec/ac3dec.c

See: 7aabeea9ba0e557e834c886de5ea4db8e9a5193d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 12:08:38 +02:00
2013-07-13 23:45:05 +00:00
2013-07-13 05:41:04 +00:00
2013-07-10 12:10:58 +00:00
2013-07-13 15:01:05 +02:00
2013-06-14 01:27:22 +02:00
2013-07-10 02:15:43 +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.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%