[FFmpeg-cvslog] Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'

Michael Niedermayer git at videolan.org
Wed Jun 3 20:13:34 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  3 19:23:06 2015 +0200| [120028968749cc65cc8eea491004d64bd5179487] | committer: Michael Niedermayer

Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'

* commit '0289f81241e720452b5a77713488d54d3ec252d7':
  aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

Conflicts:
	libavcodec/aacdec.c

Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list