1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Go to file
Michael Niedermayer 2b1922d964 Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
* commit 'b452d5ae866942cec00aa1432fe29498b38b49fc':
  mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4

Conflicts:
	libavcodec/h263dec.c

not merged, the header decode function is not the right place
See: 6c9b82b6a0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 02:27:41 +01:00
2013-11-29 14:19:47 +01: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.
Languages
C 90.1%
Assembly 7.9%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%