Michael Niedermayer ececbedaa8 Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'
* commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50':
  lavf: simplify handling of offset in av_probe_input_buuffer()

Conflicts:
	libavformat/utils.c

The simplification is broken and does not work at least for ffmpeg,
thus this change is not merged.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-13 21:23:24 +01:00
2012-05-04 18:40:36 +02:00
2014-01-10 17:51:13 +01:00
2014-01-10 17:51:13 +01:00
2013-12-29 22:57:20 +01:00
2012-04-06 10:23:26 +02:00
2013-11-29 16:41:42 +01: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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%