Merge commit '502512ea0f179165782777265f441d4061ff6012'
[ffmpeg.git] / libavcodec / alac_data.c
2012-12-06 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-12-05 Justin Rugglesalacenc: add support for multi-channel encoding