Michael Niedermayer e82b0e6126 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>

2015-02-28 23:41:36 +01:00

6.8 KiB

Raw Blame History

View Raw