Michael Niedermayer b1064dd783 Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022' ...

* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
  dca: Move ff_dca_convert_bitstream() to the DCA common code
  vdpau: wrap codec specific functions in appropiate #ifs

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-03-28 11:18:23 +01:00

5.3 KiB

Raw Blame History

View Raw