[FFmpeg-cvslog] Merge commit '36017d49e2f797f7371dc24848a2285ca63e39ab' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 18:29:50 2014 +0100| [15efd9a7c0a6ccc59c07c3118a2e075449c91e68] | committer: Michael Niedermayer

Merge commit '36017d49e2f797f7371dc24848a2285ca63e39ab' into release/0.10

* commit '36017d49e2f797f7371dc24848a2285ca63e39ab':
  Prepare for 0.8.11 Release
  lavf: make av_probe_input_buffer more robust
  Updated Changelog for 0.8.10
  oggparseogm: check timing variables
  mathematics: remove asserts from av_rescale_rnd()
  vc1: Always reset numref when parsing a new frame header.
  h264: reset num_reorder_frames if it is invalid

Conflicts:
	RELEASE
	libavcodec/vc1.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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