[FFmpeg-cvslog] Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

Michael Niedermayer git at videolan.org
Mon Sep 30 02:20:28 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 02:15:36 2013 +0200| [7a28a9f68e88f066ede77dc13a517c3c545d2a92] | committer: Michael Niedermayer

Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
  Add support for multichannel ATRAC3+ streams.

Conflicts:
	libavformat/oma.c

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

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





More information about the ffmpeg-cvslog mailing list