Merge commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 18:25:55 +0000 (20:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 18:26:07 +0000 (20:26 +0200)
commit8044ab94e485d2c40ff8d87a7907f31ed2ebc997
treecfde6406281937804eb0361be8bc43a1dbb8e8e6
parent257188acea8d93218d5bbfc65593567f1f34b4c2
parent452e343295e25f7b2cbc8529c66e9386e2ea6f55
Merge commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55' into release/0.10

* commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55':
  avcodec: Add more missing #includes for ff_get_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libgsm.c
libavcodec/libopencore-amr.c