Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Sep 2012 11:53:32 +0000 (13:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Sep 2012 11:54:24 +0000 (13:54 +0200)
commitff584803b7ea31febb3f57124a3702d13c27e24c
treeb8f22d7053d443db3929d5fe210a2c1a18eca3c8
parent874b9dcc4be78847e488df33aad51752a8bebc2e
parentcee1950bbb44acd215efd2101fb52d9605701969
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>
Changelog
libavformat/Makefile
libavformat/rtpenc.c
libavformat/rtpenc.h
libavformat/rtpenc_jpeg.c
libavformat/sdp.c
libavformat/smoothstreamingenc.c
libavformat/version.h