Michael Niedermayer ff584803b7 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  rtp: Packetization of JPEG (RFC 2435)
  smoothstreamingenc: Copy the SAR on the AVStreams as well

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/version.h

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

2012-09-24 13:54:24 +02:00

4.0 KiB

Raw Blame History

View Raw