diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-01 23:11:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-01 23:11:31 +0100 |
| commit | 1eb7f39c7b8172e02a7c95073036a2c327215db8 (patch) | |
| tree | c3323cf0b704cdc2eda65bb202af3329a8973e2a /libavformat/rtpenc.c | |
| parent | 75d11b55d7c6f9417c047500171b8aa42b8b8f50 (diff) | |
| parent | 0ce4fe482c27abfa7eac503a52fdc50b70ccd871 (diff) | |
| download | ffmpeg-1eb7f39c7b8172e02a7c95073036a2c327215db8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: error out on invalid bitdepth.
aacsbr: use a swap index for the Y matrix rather than copy buffers.
huffyuv: do not abort on unknown pix_fmt; instead, return an error.
lcl: return negative error codes on decode_init() errors.
rtpenc: Use MB info side data for splitting H263 packets for RFC 2190
h263enc: Add an option for outputting info about MBs as side data
avpacket: Add a function for shrinking already allocated side data
nellymoserdec: Saner and faster IMDCT windowing
Conflicts:
doc/APIchanges
libavcodec/avpacket.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 88a0527566..9f3fd08a55 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -453,7 +453,11 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) break; case CODEC_ID_H263: if (s->flags & FF_RTP_FLAG_RFC2190) { - ff_rtp_send_h263_rfc2190(s1, pkt->data, size); + int mb_info_size = 0; + const uint8_t *mb_info = + av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO, + &mb_info_size); + ff_rtp_send_h263_rfc2190(s1, pkt->data, size, mb_info, mb_info_size); break; } /* Fallthrough */ |