← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/webvttenc.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/webvttenc.c
46
46
static int webvtt_write_header(AVFormatContext *ctx)
47
47
{
48
48
    AVStream     *s = ctx->streams[0];
 
49
    AVCodecContext *avctx = ctx->streams[0]->codec;
49
50
    AVIOContext *pb = ctx->pb;
50
51
 
 
52
    if (ctx->nb_streams != 1 || avctx->codec_id != AV_CODEC_ID_WEBVTT) {
 
53
        av_log(ctx, AV_LOG_ERROR, "Exactly one WebVTT stream is needed.\n");
 
54
        return AVERROR(EINVAL);
 
55
    }
 
56
 
51
57
    avpriv_set_pts_info(s, 64, 1, 1000);
52
58
 
53
59
    avio_printf(pb, "WEBVTT\n");