[FFmpeg-cvslog] Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 17 05:49:41 2011 +0200| [4f643430f295a8376ca51f127a23b0f8ce92068b] | committer: Michael Niedermayer

Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
  ffmpeg: merge output_codecs array into AVOutputStream members.
  rtpenc_latm: Consistently use "Libav" in license boilerplate.
  rtsp: Don't pass string pointer as format string to ff_url_join
  mmsh: fixed printf injection bug in mmsh request
  codec-regression: remove pointless -r options for dnxhd

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

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