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)
* commit '2d40968dd3ff17b12f7c80dbfad409b14418e267':
  lavu: Drop deprecated audioconvert.h header

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

Simple merge
Simple merge