Merge commit '38e9585d'
* commit '38e9585d': 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>
Showing
Please
register
or
sign in
to comment