[FFmpeg-cvslog] Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 22:19:18 2014 +0200| [3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4] | committer: Michael Niedermayer

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

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

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