← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/sapenc.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavformat/sapenc.c
146
146
                    "?ttl=%d", ttl);
147
147
        if (!same_port)
148
148
            base_port += 2;
149
 
        ret = ffurl_open(&fd, url, AVIO_FLAG_WRITE);
 
149
        ret = ffurl_open(&fd, url, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL);
150
150
        if (ret) {
151
151
            ret = AVERROR(EIO);
152
152
            goto fail;
158
158
 
159
159
    ff_url_join(url, sizeof(url), "udp", NULL, announce_addr, port,
160
160
                "?ttl=%d&connect=1", ttl);
161
 
    ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_WRITE);
 
161
    ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_WRITE,
 
162
                     &s->interrupt_callback, NULL);
162
163
    if (ret) {
163
164
        ret = AVERROR(EIO);
164
165
        goto fail;
250
251
}
251
252
 
252
253
AVOutputFormat ff_sap_muxer = {
253
 
    "sap",
254
 
    NULL_IF_CONFIG_SMALL("SAP output format"),
255
 
    NULL,
256
 
    NULL,
257
 
    sizeof(struct SAPState),
258
 
    CODEC_ID_AAC,
259
 
    CODEC_ID_MPEG4,
260
 
    sap_write_header,
261
 
    sap_write_packet,
262
 
    sap_write_close,
 
254
    .name              = "sap",
 
255
    .long_name         = NULL_IF_CONFIG_SMALL("SAP output format"),
 
256
    .priv_data_size    = sizeof(struct SAPState),
 
257
    .audio_codec       = CODEC_ID_AAC,
 
258
    .video_codec       = CODEC_ID_MPEG4,
 
259
    .write_header      = sap_write_header,
 
260
    .write_packet      = sap_write_packet,
 
261
    .write_trailer     = sap_write_close,
263
262
    .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
264
263
};
265
264