Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:41:36 +0000 (23:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:41:36 +0000 (23:41 +0100)
commite82b0e612607d652c1519ee31d30272113775679
tree9e58ce913ebb7fd54257eb67806d5e4351d4a79e
parentca6fee7606866a0cb7676b95db4c462500cc8d2d
parentee964145b5d229571e00bf6883a44189d02babe2
Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'

* commit 'ee964145b5d229571e00bf6883a44189d02babe2':
  lavc: remove unused traces of fmtconvert usage

Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/binkaudio.c
libavcodec/nellymoserdec.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h