[FFmpeg-cvslog] Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep  5 17:52:10 2015 +0200| [2df52088ef5c4ce284af99775dfe7ad1fed03614] | committer: Hendrik Leppkes

Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a'

* commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a':
  Postpone API-incompatible changes until the next bump

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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