[FFmpeg-cvslog] Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'

Michael Niedermayer git at videolan.org
Tue Feb 17 20:25:04 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 20:18:19 2015 +0100| [d2668ae472690fe102b7c63fbddd716ebca25dd3] | committer: Michael Niedermayer

Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'

* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
  dca: Remove separate header for DCA ExSS

Conflicts:
	libavcodec/dca.h
	libavcodec/dca_exss.h

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

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





More information about the ffmpeg-cvslog mailing list