Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:18:05 +0000 (17:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:18:05 +0000 (17:18 +0200)
commitd9218011ef411c56073f63629842a1fa26454c75
treeaafe875fa4ed3d0f76ebce72394010685b9d39bd
parentd96d0252fd535db5183492b804341cba93468b15
parent2d40968dd3ff17b12f7c80dbfad409b14418e267
Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267'

* commit '2d40968dd3ff17b12f7c80dbfad409b14418e267':
  lavu: Drop deprecated audioconvert.h header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavutil/Makefile
libavutil/version.h