[FFmpeg-cvslog] Merge remote-tracking branch 'dwbuiten/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 15 03:40:12 2012 +0200| [ab46300078d6c047c975c43baa71a32ca707e312] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab46300078d6c047c975c43baa71a32ca707e312
---