| Message ID | 20200121220339.14960-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel] avformat/libsrt: add missing SRT_VERSION_VALUE check | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
On Tue, 21 Jan 2020, Marton Balint wrote: > This was missed in d7e2a2bb35e394287b3e3dc27744830bf0b7ca99. Pushed. Regards, Marton > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavformat/libsrt.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c > index 443df5bee8..d7faa603f5 100644 > --- a/libavformat/libsrt.c > +++ b/libavformat/libsrt.c > @@ -525,6 +525,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) > av_freep(&s->passphrase); > s->passphrase = av_strndup(buf, strlen(buf)); > } > +#if SRT_VERSION_VALUE >= 0x010302 > if (av_find_info_tag(buf, sizeof(buf), "enforced_encryption", p)) { > s->enforced_encryption = strtol(buf, NULL, 10); > } > @@ -534,6 +535,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) > if (av_find_info_tag(buf, sizeof(buf), "kmpreannounce", p)) { > s->kmpreannounce = strtol(buf, NULL, 10); > } > +#endif > if (av_find_info_tag(buf, sizeof(buf), "mss", p)) { > s->mss = strtol(buf, NULL, 10); > } > -- > 2.16.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 443df5bee8..d7faa603f5 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -525,6 +525,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) av_freep(&s->passphrase); s->passphrase = av_strndup(buf, strlen(buf)); } +#if SRT_VERSION_VALUE >= 0x010302 if (av_find_info_tag(buf, sizeof(buf), "enforced_encryption", p)) { s->enforced_encryption = strtol(buf, NULL, 10); } @@ -534,6 +535,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) if (av_find_info_tag(buf, sizeof(buf), "kmpreannounce", p)) { s->kmpreannounce = strtol(buf, NULL, 10); } +#endif if (av_find_info_tag(buf, sizeof(buf), "mss", p)) { s->mss = strtol(buf, NULL, 10); }
This was missed in d7e2a2bb35e394287b3e3dc27744830bf0b7ca99. Signed-off-by: Marton Balint <cus@passwd.hu> --- libavformat/libsrt.c | 2 ++ 1 file changed, 2 insertions(+)