Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:13:51 +0000 (11:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:13:55 +0000 (11:13 +0100)
commitacda7c8e20dc7cfda038edd0dfbac98f40970111
treefb7ec3c40b144d4d690f2d7d6dbdca1bef3a7adc
parent2cfccd8060b9c4c61ae861a2842469708c71de72
parent70a7b24d56a823894440a372c46e89e212b89c35
Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

* commit '70a7b24d56a823894440a372c46e89e212b89c35':
  avutil: Add deprecation ifdefs around obsolete intfloat code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/intfloat_readwrite.c
libavutil/intfloat_readwrite.h
libavutil/version.h