Michael Niedermayer 7609d42d0f Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'
* commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8':
  vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

Conflicts:
	libavcodec/mpeg12.c

Nothing changes as the buggy code is not in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:07:48 +01:00
2013-03-27 01:44:20 +01:00
2013-03-26 17:31:41 +01:00
2013-03-22 23:19:07 +01:00
2013-03-26 01:51:19 +01:00
2013-03-05 18:36:40 +00:00
2013-03-26 17:31:41 +01:00
2013-01-06 21:42:35 +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 209 MiB
Languages
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%