291b220377
* qatar/master: avconv: flush filtered frames before reconfiguring filters mov: stsd entries must be at least 16 byte mov: detect EOF in mov_read_dref() file: return proper error on seek failures Conflicts: libavformat/file.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
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.