| Message ID | tencent_536D95C6A9128EB565589305684CD3E51305@qq.com |
|---|---|
| State | Accepted |
| Commit | 397a777aa116f7da0d8c23bfc21874c3381e1c71 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/libsrt: fix deprecated warning | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On Fri, Mar 25, 2022 at 03:39:04PM +0800, Zhao Zhili wrote: > srt_socket was deprecated after 1.4.1. > --- > libavformat/libsrt.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c > index 19b9cb9895..1610ce8318 100644 > --- a/libavformat/libsrt.c > +++ b/libavformat/libsrt.c > @@ -429,7 +429,11 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) > > restart: > > +#if SRT_VERSION_VALUE >= 0x010401 > + fd = srt_create_socket(); > +#else > fd = srt_socket(cur_ai->ai_family, cur_ai->ai_socktype, 0); > +#endif > if (fd < 0) { > ret = libsrt_neterrno(h); > goto fail; > -- > 2.31.1 LGTM > > _______________________________________________ > 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".
> 2022年3月29日 下午9:18，lance.lmwang@gmail.com 写道： > > On Fri, Mar 25, 2022 at 03:39:04PM +0800, Zhao Zhili wrote: >> srt_socket was deprecated after 1.4.1. >> --- >> libavformat/libsrt.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c >> index 19b9cb9895..1610ce8318 100644 >> --- a/libavformat/libsrt.c >> +++ b/libavformat/libsrt.c >> @@ -429,7 +429,11 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) >> >> restart: >> >> +#if SRT_VERSION_VALUE >= 0x010401 >> + fd = srt_create_socket(); >> +#else >> fd = srt_socket(cur_ai->ai_family, cur_ai->ai_socktype, 0); >> +#endif >> if (fd < 0) { >> ret = libsrt_neterrno(h); >> goto fail; >> -- >> 2.31.1 > > LGTM Applied as 397a777aa116f7da0d8c23bfc21874c3381e1c71 > >> >> _______________________________________________ >> 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". > > -- > Thanks, > Limin Wang > _______________________________________________ > 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". Thanks Steven Liu
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 19b9cb9895..1610ce8318 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -429,7 +429,11 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) restart: +#if SRT_VERSION_VALUE >= 0x010401 + fd = srt_create_socket(); +#else fd = srt_socket(cur_ai->ai_family, cur_ai->ai_socktype, 0); +#endif if (fd < 0) { ret = libsrt_neterrno(h); goto fail;