diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-24 13:53:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-24 13:54:24 +0200 |
| commit | ff584803b7ea31febb3f57124a3702d13c27e24c (patch) | |
| tree | b8f22d7053d443db3929d5fe210a2c1a18eca3c8 /libavformat/rtpenc.c | |
| parent | 874b9dcc4be78847e488df33aad51752a8bebc2e (diff) | |
| parent | cee1950bbb44acd215efd2101fb52d9605701969 (diff) | |
| download | ffmpeg-ff584803b7ea31febb3f57124a3702d13c27e24c.tar.gz | |
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>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 3a3e3d8ee2..653eded94c 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -76,6 +76,7 @@ static int is_supported(enum AVCodecID id) case AV_CODEC_ID_ADPCM_G726: case AV_CODEC_ID_ILBC: case AV_CODEC_ID_SPEEX: + case AV_CODEC_ID_MJPEG: return 1; default: return 0; @@ -525,6 +526,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) case AV_CODEC_ID_ILBC: rtp_send_ilbc(s1, pkt->data, size); break; + case AV_CODEC_ID_MJPEG: + ff_rtp_send_jpeg(s1, pkt->data, size); + break; default: /* better than nothing : send the codec raw data */ rtp_send_raw(s1, pkt->data, size); |