Michael Niedermayer 2bfcd74ad3 Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
  mpeg12: Move Mpeg1Context declaration to the only place it is used

Conflicts:
	libavcodec/mpeg12.h
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:56:05 +01:00
2013-03-27 01:44:20 +01:00
2012-05-04 18:40:36 +02: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
2011-04-08 02:50:13 +02:00
2013-03-05 18:36:40 +00:00
2013-03-26 17:31:41 +01:00
2012-04-06 10:23:26 +02: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 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%