[FFmpeg-cvslog] Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 14:48:41 2015 +0200| [187f4278e81c19c79b8a0dbad513e47a00875a57] | committer: Michael Niedermayer

Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'

* commit 'a53540840d26beb57a5e53b7f488c23ddf86e193':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
	doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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