Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 12:48:41 +0000 (14:48 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 12:50:41 +0000 (14:50 +0200)
commit187f4278e81c19c79b8a0dbad513e47a00875a57
tree8bce92071141b185bcd67abbb0cc1cf9429340b5
parent694f9ab1ef141cf80de8f81db6955a17606182af
parenta53540840d26beb57a5e53b7f488c23ddf86e193
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@niedermayer.cc>