Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 15:03:13 +0000 (16:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 15:14:38 +0000 (16:14 +0100)
commit71949ef715a29878424b2fb40c471cfb71c6bb98
tree6d83bab24e4218eba1c840ba76081d00ba746315
parent54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff
parent5945c7b35d9169caf9ecef1c419eebdebb909e60
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>
Changelog
libavcodec/Makefile
libavcodec/alac.c
libavcodec/alac_data.c
libavcodec/alac_data.h
libavcodec/alacenc.c