ffmpeg4.patch

   1 --- tvheadend-4.0.8/src/muxer/muxer_libav.c~    2015-12-16 18:33:33.000000000 +0100
   2 +++ tvheadend-4.0.8/src/muxer/muxer_libav.c     2018-04-29 19:32:22.156055706 +0200
   3 @@ -160,7 +160,7 @@
   4    }
   5
   6    if(lm->lm_oc->oformat->flags & AVFMT_GLOBALHEADER)
   7 -    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
   8 +    c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
   9
  10    return 0;
  11  }
  12 --- tvheadend-4.0.8/src/plumbing/transcoding.c~ 2018-04-29 19:28:53.000000000 +0200
  13 +++ tvheadend-4.0.8/src/plumbing/transcoding.c  2018-04-29 19:33:35.763344908 +0200
  14 @@ -19,7 +19,7 @@
  15  #include <unistd.h>
  16  #include <libavformat/avformat.h>
  17  #include <libavcodec/avcodec.h>
  18 -#include <libavfilter/avfiltergraph.h>
  19 +#include <libavfilter/avfilter.h>
  20  #include <libavfilter/buffersink.h>
  21  #include <libavfilter/buffersrc.h>
  22  #include <libavutil/opt.h>
  23 @@ -559,12 +559,12 @@
  24        break;
  25
  26      case SCT_AAC:
  27 -      octx->flags         |= CODEC_FLAG_BITEXACT;
  28 +      octx->flags         |= AV_CODEC_FLAG_BITEXACT;
  29        break;
  30
  31      case SCT_VORBIS:
  32 -      octx->flags         |= CODEC_FLAG_QSCALE;
  33 -      octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
  34 +      octx->flags         |= AV_CODEC_FLAG_QSCALE;
  35 +      octx->flags         |= AV_CODEC_FLAG_GLOBAL_HEADER;
  36        octx->global_quality = 4*FF_QP2LAMBDA;
  37        break;
  38
  39 @@ -1172,7 +1172,7 @@
  40      case SCT_MPEG2VIDEO:
  41        octx->codec_id       = AV_CODEC_ID_MPEG2VIDEO;
  42        octx->pix_fmt        = AV_PIX_FMT_YUV420P;
  43 -      octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
  44 +      octx->flags         |= AV_CODEC_FLAG_GLOBAL_HEADER;
  45
  46        // Default settings for quantizer. Best quality unless changed by the streaming profile.
  47        octx->qmin           = 1;
  48 @@ -1231,7 +1231,7 @@
  49      case SCT_H264:
  50        octx->codec_id       = AV_CODEC_ID_H264;
  51        octx->pix_fmt        = AV_PIX_FMT_YUV420P;
  52 -      octx->flags          |= CODEC_FLAG_GLOBAL_HEADER;
  53 +      octx->flags          |= AV_CODEC_FLAG_GLOBAL_HEADER;
  54
  55        // Qscale difference between I-frames and P-frames.
  56        // Note: -i_qfactor is handled a little differently than --ipratio.
  57 @@ -1965,7 +1965,7 @@
  58      if (!WORKING_ENCODER(p->id))
  59        continue;
  60
  61 -    if ((p->capabilities & CODEC_CAP_EXPERIMENTAL) && !experimental)
  62 +    if ((p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && !experimental)
  63        continue;
  64
  65      sct = codec_id2streaming_component_type(p->id);
  66 @@ -1978,7 +1978,7 @@
  67      htsmsg_add_str(m, "name", p->name);
  68      snprintf(buf, sizeof(buf), "%s%s",
  69               p->long_name ?: "",
  70 -             (p->capabilities & CODEC_CAP_EXPERIMENTAL) ?
  71 +             (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) ?
  72                 " (Experimental)" : "");
  73      if (buf[0] != '\0')
  74        htsmsg_add_str(m, "long_name", buf);