[FFmpeg-trac] #8760(avformat:new): srt updated, ffmpeg's libsrt no longer builds

[FFmpeg]

#8760: srt updated, ffmpeg's libsrt no longer builds
-------------------------------------+------------------------------------
             Reporter:  hydra3333    |                    Owner:
                 Type:  enhancement  |                   Status:  new
             Priority:  wish         |                Component:  avformat
              Version:  git-master   |               Resolution:
             Keywords:  libsrt       |               Blocked By:
             Blocking:               |  Reproduced by developer:  0
Analyzed by developer:  0            |
-------------------------------------+------------------------------------

Comment (by mdsh):

 Is this all that's required?


 {{{
 diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
 index 4de575b..158f6b8 100644
 --- a/libavformat/libsrt.c
 +++ b/libavformat/libsrt.c
 @@ -313,8 +313,7 @@
          (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN,
 "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) ||
          (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE,
 "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) ||
  #if SRT_VERSION_VALUE >= 0x010302
 -        /* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for
 compatibility, we used SRTO_STRICTENC */
 -        (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd,
 SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption,
 sizeof(s->enforced_encryption)) < 0) ||
 +        (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd,
 SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION",
 &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
          (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd,
 SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate,
 sizeof(s->kmrefreshrate)) < 0) ||
          (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd,
 SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce,
 sizeof(s->kmpreannounce)) < 0) ||
  #endif
 @@ -333,7 +332,7 @@
          (s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL,
 "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) ||
          (s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION,
 "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) ||
          (s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID,
 "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) ||
 -        (s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER,
 "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) ||
 +        (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION,
 "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) ||
          (s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI,
 "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) ||
          (s->payload_size >= 0 && libsrt_setsockopt(h, fd,
 SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size,
 sizeof(s->payload_size)) < 0) ||
          ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd,
 SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) {

 }}}

--
Ticket URL: <https://trac.ffmpeg.org/ticket/8760#comment:5>
FFmpeg <https://ffmpeg.org>
FFmpeg issue tracker