[FFmpeg-cvslog] Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 28 12:33:07 2014 +0200| [e925a82e2478adfbfb17813729ed8e68cf9c7120] | committer: Michael Niedermayer

Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'

* commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12':
  apichanges: fill in changes for lavu 51.19 and 51.20

Conflicts:
	doc/APIchanges

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

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