xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-11 05:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,526 Commits 31 Branches 338 Tags 298 MiB
a52f443714
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
71949ef715 Merge remote-tracking branch 'qatar/master' 
* 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 16:14:38 +01:00
Justin Ruggles
5e1bbb8c7e alacenc: add support for multi-channel encoding 2012-12-05 16:13:37 -05:00