[FFmpeg-cvslog] Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 00:34:12 2015 +0200| [15bcbc9d3b88b7f2564eca81b754b6d863906bb9] | committer: Michael Niedermayer

Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'

* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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