| Index: source/patched-ffmpeg-mt/libavformat/utils.c
|
| ===================================================================
|
| --- source/patched-ffmpeg-mt/libavformat/utils.c (revision 50820)
|
| +++ source/patched-ffmpeg-mt/libavformat/utils.c (working copy)
|
| @@ -283,9 +283,39 @@
|
| return NULL;
|
| }
|
|
|
| -/* memory handling */
|
| +#if LIBAVFORMAT_VERSION_MAJOR < 53 && CONFIG_SHARED && HAVE_SYMVER
|
| +FF_SYMVER(void, av_destruct_packet_nofree, (AVPacket *pkt), "LIBAVFORMAT_52")
|
| +{
|
| + av_destruct_packet_nofree(pkt);
|
| +}
|
|
|
| +FF_SYMVER(void, av_destruct_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
|
| +{
|
| + av_destruct_packet(pkt);
|
| +}
|
|
|
| +FF_SYMVER(int, av_new_packet, (AVPacket *pkt, int size), "LIBAVFORMAT_52")
|
| +{
|
| + return av_new_packet(pkt, size);
|
| +}
|
| +
|
| +FF_SYMVER(int, av_dup_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
|
| +{
|
| + return av_dup_packet(pkt);
|
| +}
|
| +
|
| +FF_SYMVER(void, av_free_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
|
| +{
|
| + av_free_packet(pkt);
|
| +}
|
| +
|
| +FF_SYMVER(void, av_init_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
|
| +{
|
| + av_log(NULL, AV_LOG_WARNING, "Diverting av_*_packet function calls to libavcodec. Recompile to improve performance\n");
|
| + av_init_packet(pkt);
|
| +}
|
| +#endif
|
| +
|
| int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size)
|
| {
|
| int ret= av_new_packet(pkt, size);
|
| @@ -3576,7 +3606,7 @@
|
| str[0] = '\0';
|
| if (proto)
|
| av_strlcatf(str, size, "%s://", proto);
|
| - if (authorization)
|
| + if (authorization && authorization[0])
|
| av_strlcatf(str, size, "%s@", authorization);
|
| #if CONFIG_NETWORK && defined(AF_INET6)
|
| /* Determine if hostname is a numerical IPv6 address,
|
|
|