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)
* 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>
1  2 
libavcodec/libfdk-aacenc.c

Simple merge