mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
7023715e88
* commit '38e9585de993c32899588ab037180f2c930ce74c': Makefile: Remove stray tabs vp8: Wait for prev_frame to parse segment_map before reading it yuv4mpeg: Correctly round chroma up for odd luma sizes rmdec: Use the AVIOContext given as parameter in rm_read_metadata() avio: Handle AVERROR_EOF in the same way as the return value 0 Conflicts: libavformat/rmdec.c libavformat/yuv4mpeg.c No change as all the commits where already in before 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.