Michael Niedermayer 20bc5924a0 Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'
* commit '96138e8c8da4b9397e627c934a33c22988d1192b':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

See: b6ad5893ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 01:55:12 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-30 20:45:07 +02:00
2014-03-01 17:09:12 +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%