eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 03:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ada4f4f715c45809c401b965ac0f9af83fb6b676
ffmpeg/libavformat/rtpenc_jpeg.c
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.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink