← Back to branch summary

~ubuntu-branches/debian/sid/ffmpeg/sid

« back to all changes in this revision

Viewing changes to libavformat/mpeg.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Balint Reczey, Andreas Cadhalpun
  • Date: 2015-10-15 00:26:09 UTC
  • mfrom: (0.1.30)
  • Revision ID: package-import@ubuntu.com-20151015002609-ojtldgbtcfmhnewu
Tags: 7:2.8.1-1
[ Balint Reczey ]
* Add myself to uploaders.

[ Andreas Cadhalpun ]
* Import new upstream bugfix release 2.8.1.
* Remove hls-only-seek-if-there-is-an-offset.patch included upstream.
* Add avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch to
  fix CVE-2015-6761.
* Enable x264 on mips64el and opencv on alpha.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/mpeg.c
939
939
        total_read += pkt_size;
940
940
 
941
941
        /* the current chunk doesn't match the stream index (unlikely) */
942
 
        if ((startcode & 0x1f) != idx_pkt.stream_index)
 
942
        if ((startcode & 0x1f) != s->streams[idx_pkt.stream_index]->id)
943
943
            break;
944
944
 
945
945
        ret = av_grow_packet(pkt, to_read);