[FFmpeg-cvslog] Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 20:43:11 2014 +0200| [a561662fb7223cb98907744e03398848a0d362e1] | committer: Michael Niedermayer

Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
  avcodec: Undeprecate reordered_opaque

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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