Merge remote-tracking branch 'dwbuiten/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Jul 2012 01:40:12 +0000 (03:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Jul 2012 01:40:19 +0000 (03:40 +0200)
commitab46300078d6c047c975c43baa71a32ca707e312
tree7c19f2d74084f63bc80e72af6e5056266f05b4c3
parent39afcf1d7eba8f2f3d59c973aa57df714e679629
parent86dd5fbf1505a09afe8eaa66548e8876d5a9e817
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  doc: Remove stray @item from git-howto
  libfdk-aac: Port to ff_alloc_packet2
  doxy: move av_guess_sample_aspect_ratio to correct place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libfdk-aacenc.c