← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-proposed

« back to all changes in this revision

Viewing changes to libavformat/movenchint.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/movenchint.c
24
24
#include "internal.h"
25
25
#include "rtpenc_chain.h"
26
26
#include "avio_internal.h"
 
27
#include "rtp.h"
27
28
 
28
29
int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index)
29
30
{
42
43
    track->enc->codec_type = AVMEDIA_TYPE_DATA;
43
44
    track->enc->codec_tag  = track->tag;
44
45
 
45
 
    track->rtp_ctx = ff_rtp_chain_mux_open(s, src_st, NULL,
46
 
                                           RTP_MAX_PACKET_SIZE);
47
 
    if (!track->rtp_ctx)
 
46
    ret = ff_rtp_chain_mux_open(&track->rtp_ctx, s, src_st, NULL,
 
47
                                RTP_MAX_PACKET_SIZE, src_index);
 
48
    if (ret < 0)
48
49
        goto fail;
49
50
 
50
51
    /* Copy the RTP AVStream timebase back to the hint AVStream */
332
333
        size -= 4;
333
334
        if (packet_len > size || packet_len <= 12)
334
335
            break;
335
 
        if (data[1] >= 200 && data[1] <= 204) {
 
336
        if (RTP_PT_IS_RTCP(data[1])) {
336
337
            /* RTCP packet, just skip */
337
338
            data += packet_len;
338
339
            size -= packet_len;
459
460
    }
460
461
    avformat_free_context(rtp_ctx);
461
462
}
462