[FFmpeg-cvslog] Merge commit '38e9585de993c32899588ab037180f2c930ce74c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  8 03:41:33 2013 +0200| [7023715e888005f405a34ec1111d98cf3230bdaf] | committer: Michael Niedermayer

Merge commit '38e9585de993c32899588ab037180f2c930ce74c'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7023715e888005f405a34ec1111d98cf3230bdaf
---