Michael Niedermayer 50ffd8439c Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
  buffersrc: avoid using AV_PIX_FMT_NB

Conflicts:
	libavfilter/buffersrc.c

No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 03:18:27 +02:00
2014-05-26 11:54:35 -08:00
2014-05-26 11:40:21 +02:00
2014-05-26 11:40:21 +02:00
2014-05-23 23:30:21 +02:00
2014-05-21 15:59:22 +02:00
2014-05-26 12:18:29 -08: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 89.1%
Assembly 8.4%
Makefile 1.4%
GLSL 0.3%
C++ 0.3%
Other 0.2%