diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-20 10:48:39 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | d6799ee0e41dee35ebf9c664173aed8e3ab24141 (patch) | |
| tree | cb1fc69b085144f84c26cb02e9ae6f9cebb628b8 /libavformat/avformat.c | |
| parent | aaefe47913c01cf4126b5fd4f53a5e8ecceade4d (diff) | |
| download | ffmpeg-d6799ee0e41dee35ebf9c664173aed8e3ab24141.tar.gz | |
avformat: remove deprecated FF_API_AVFORMAT_IO_CLOSE
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/avformat.c')
| -rw-r--r-- | libavformat/avformat.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 98dfac2f89..140fb5b6aa 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -944,18 +944,8 @@ void ff_format_set_url(AVFormatContext *s, char *url) int ff_format_io_close(AVFormatContext *s, AVIOContext **pb) { int ret = 0; - if (*pb) { -#if FF_API_AVFORMAT_IO_CLOSE -FF_DISABLE_DEPRECATION_WARNINGS - if (s->io_close == ff_format_io_close_default || s->io_close == NULL) -#endif - ret = s->io_close2(s, *pb); -#if FF_API_AVFORMAT_IO_CLOSE - else - s->io_close(s, *pb); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - } + if (*pb) + ret = s->io_close2(s, *pb); *pb = NULL; return ret; } |