Michael Niedermayer 4f643430f2 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>

2011-06-17 05:49:58 +02:00

2.0 KiB

Raw Blame History

View Raw