← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/h264_mp4toannexb_bsf.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:
libavcodec/h264_mp4toannexb_bsf.c
122
122
        if (!unit_nb && !sps_done++) {
123
123
            unit_nb = *extradata++; /* number of pps unit(s) */
124
124
            if (unit_nb) {
125
 
                ctx->pps_offset = (extradata - 1) - (avctx->extradata + 4);
 
125
                ctx->pps_offset = total_size;
126
126
                pps_seen = 1;
127
127
            }
128
128
        }
276
276
{
277
277
    H264BSFContext *ctx = bsfc->priv_data;
278
278
    if (ctx->private_spspps)
279
 
        av_free(ctx->spspps_buf);
 
279
        av_freep(&ctx->spspps_buf);
280
280
}
281
281
 
282
282
AVBitStreamFilter ff_h264_mp4toannexb_bsf = {