Revision 1a45a9f4

View differences:

libavformat/rdt.c
295 295

  
296 296
/**< return 0 on packet, no more left, 1 on packet, 1 on partial packet... */
297 297
static int
298
rdt_parse_packet (PayloadContext *rdt, AVStream *st,
298
rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
299 299
                  AVPacket *pkt, uint32_t *timestamp,
300 300
                  const uint8_t *buf, int len, int flags)
301 301
{
......
347 347
    if (!buf && s->prev_stream_id != -1) {
348 348
        /* return the next packets, if any */
349 349
        timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned....
350
        rv= s->parse_packet(s->dynamic_protocol_context,
350
        rv= s->parse_packet(s->ic, s->dynamic_protocol_context,
351 351
                            s->streams[s->prev_stream_id],
352 352
                            pkt, &timestamp, NULL, 0, flags);
353 353
        return rv;
......
374 374
         return -1;
375 375
     }
376 376

  
377
    rv = s->parse_packet(s->dynamic_protocol_context,
377
    rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
378 378
                         s->streams[s->prev_stream_id],
379 379
                         pkt, &timestamp, buf, len, flags);
380 380

  
libavformat/rtp.h
107 107
/**
108 108
 * Packet parsing for "private" payloads in the RTP specs.
109 109
 *
110
 * @param ctx RTSP demuxer context
110 111
 * @param s stream context
111 112
 * @param st stream that this packet belongs to
112 113
 * @param pkt packet in which to write the parsed data
......
115 116
 * @param len length of buf
116 117
 * @param flags flags from the RTP packet header (PKT_FLAG_*)
117 118
 */
118
typedef int (*DynamicPayloadPacketHandlerProc) (PayloadContext *s,
119
typedef int (*DynamicPayloadPacketHandlerProc) (AVFormatContext *ctx,
120
                                                PayloadContext *s,
119 121
                                                AVStream *st,
120 122
                                                AVPacket * pkt,
121 123
                                                uint32_t *timestamp,
libavformat/rtp_h264.c
159 159
}
160 160

  
161 161
// return 0 on packet, no more left, 1 on packet, 1 on partial packet...
162
static int h264_handle_packet(PayloadContext *data,
162
static int h264_handle_packet(AVFormatContext *ctx,
163
                              PayloadContext *data,
163 164
                              AVStream *st,
164 165
                              AVPacket * pkt,
165 166
                              uint32_t * timestamp,
libavformat/rtpdec.c
407 407
        /* return the next packets, if any */
408 408
        if(s->st && s->parse_packet) {
409 409
            timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned....
410
            rv= s->parse_packet(s->dynamic_protocol_context,
410
            rv= s->parse_packet(s->ic, s->dynamic_protocol_context,
411 411
                                s->st, pkt, &timestamp, NULL, 0, flags);
412 412
            finalize_packet(s, pkt, timestamp);
413 413
            return rv;
......
472 472
            return 1;
473 473
        }
474 474
    } else if (s->parse_packet) {
475
        rv = s->parse_packet(s->dynamic_protocol_context,
475
        rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
476 476
                             s->st, pkt, &timestamp, buf, len, flags);
477 477
    } else {
478 478
        // at this point, the RTP header has been stripped;  This is ASSUMING that there is only 1 CSRC, which in't wise.

Also available in: Unified diff