Merge commit 'b94ec30428b9696f99b08055735689623fe63954'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 21:21:23 +0000 (23:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 21:21:23 +0000 (23:21 +0200)
commite3ec2cde2c394af6c9b64bccd39bc206a88a4e58
tree0b92c7fb4a905429cbac55bf810575d8b656f12a
parent29d147c94dd40a78ca3981f39365cc77dae9a0da
parentb94ec30428b9696f99b08055735689623fe63954
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'

* commit 'b94ec30428b9696f99b08055735689623fe63954':
  lavc: Update version and APIchanges

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h