summaryrefslogtreecommitdiff
path: root/libavcodec/alac_data.h
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-06
| | | | | | | | | | | | | * qatar/master: h264: slice-mt: check master context for valid current_picture_ptr h264: slice-mt: get last_pic_dropable from master context alacenc: add support for multi-channel encoding Conflicts: Changelog libavcodec/alac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* alacenc: add support for multi-channel encodingJustin Ruggles2012-12-05