Age | Commit message (Collapse) | Author | |
---|---|---|---|
2012-12-06 | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | |
* 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> | |||
2012-12-06 | alacenc: add support for multi-channel encoding | Justin Ruggles | |