[Asterisk-code-review] res_http_media_cache.c: Fix merge errors from 18 -> master (asterisk[master])

[Joshua Colp]

Attention is currently required from: Sean Bright.
Joshua Colp has posted comments on this change. ( https://gerrit.asterisk.org/c/asterisk/+/16155 )

Change subject: res_http_media_cache.c: Fix merge errors from 18 -> master
......................................................................


Patch Set 1: Code-Review+1


-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16155
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I6624f2d3a57f76a89bb372ef54a124929a0338d7
Gerrit-Change-Number: 16155
Gerrit-PatchSet: 1
Gerrit-Owner: Sean Bright <sean at seanbright.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-CC: Friendly Automation
Gerrit-Attention: Sean Bright <sean at seanbright.com>
Gerrit-Comment-Date: Mon, 19 Jul 2021 12:34:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210719/76530d88/attachment.html>