[FFmpeg-cvslog] Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 12:29:05 2014 +0100| [ee2c1e6dd337aeda24bcd95b55e4fb6e0b4f3638] | committer: Michael Niedermayer

Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'

* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
	doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list

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

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