Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2012-12-06 | 1 | -4/+4 |
| | | | | | | | | | | | | | * 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 encoding | Justin Ruggles | 2012-12-05 | 1 | -0/+46 |