[FFmpeg-cvslog] Merge commit 'd9bf716945046333c24580d538f450b516f15710'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 14:10:26 2013 +0100| [144529e09493fa5e395eabb8a214e6aec1cfc166] | committer: Michael Niedermayer

Merge commit 'd9bf716945046333c24580d538f450b516f15710'

* commit 'd9bf716945046333c24580d538f450b516f15710':
  ppc: vorbisdsp: Drop some unnecessary #includes
  avconv: Increase the SDP buffer size to fit xiph SDPs

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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