Commit 7023715e authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5312c319 38e9585d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment