← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mpv/vivid

« back to all changes in this revision

Viewing changes to demux/demux_lavf.c

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2014-12-22 19:08:25 UTC
  • mfrom: (28.1.3 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141222190825-bdtz8aiwvv65wpmi
Tags: 0.7.2-1ubuntu1
debian/rules: Disable altivec on ppc64el again, as it FTBFS with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
demux/demux_lavf.c
286
286
        .buf_size = 0,
287
287
        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
288
288
    };
 
289
    if (!avpd.buf)
 
290
        return -1;
289
291
 
290
292
    bool final_probe = false;
291
293
    do {
679
681
        return -1;
680
682
 
681
683
    avfc = avformat_alloc_context();
 
684
    if (!avfc)
 
685
        return -1;
682
686
 
683
687
    if (lavfdopts->cryptokey)
684
688
        parse_cryptokey(avfc, lavfdopts->cryptokey);