[FFmpeg-cvslog] Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'

Michael Niedermayer git at videolan.org
Tue Nov 4 22:46:32 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  4 22:33:09 2014 +0100| [ae4bb6c4884f16474856d7c6537e16999d4b16b1] | committer: Michael Niedermayer

Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'

* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
  aacdec: add default case in channel layout

Conflicts:
	libavcodec/aacdec.c

Note, the default case is currently unreachable

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

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





More information about the ffmpeg-cvslog mailing list