Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jun 2011 03:49:41 +0000 (05:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jun 2011 03:49:58 +0000 (05:49 +0200)
commit4f643430f295a8376ca51f127a23b0f8ce92068b
treed21f7dc85241d354636964c50d17481c2442a8da
parentd8ee777021ac251c48274e7fd9864acb9e19a5cb
parent9446d75941d639f19cfa9ae007eb4c5ca041f200
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@gmx.at>
ffmpeg.c
libavformat/rtpenc_latm.c
libavformat/rtsp.c
tests/codec-regression.sh