[FFmpeg-cvslog] Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'

Michael Niedermayer git at videolan.org
Mon Dec 10 02:10:50 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 10 02:06:50 2012 +0100| [a93369845783a5a63e713c143cab2c550a6ccd82] | committer: Michael Niedermayer

Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'

* commit '30b39164256999efc8d77edc85e2e0b963c24834':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h

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

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





More information about the ffmpeg-cvslog mailing list