[FFmpeg-cvslog] Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'

Michael Niedermayer git at videolan.org
Thu Mar 28 11:19:51 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 11:11:00 2013 +0100| [b1064dd783b25b80ec0790876877bc886c2ec449] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1064dd783b25b80ec0790876877bc886c2ec449
---





More information about the ffmpeg-cvslog mailing list