]> git.sesse.net Git - ffmpeg/commit
avformat/hls: clean up duplicate option fields
authorRichard Shaffer <rshaffer@tunein.com>
Tue, 17 Apr 2018 06:40:06 +0000 (14:40 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Tue, 17 Apr 2018 06:40:06 +0000 (14:40 +0800)
commitc116221d90d63cc558a8e91d8a86f56545111011
treeadf70c83e989a9fca88eca4ac89794fd4bcc797e
parent6a1be7561c870a8cd3cee86a57aabdffb19e3870
avformat/hls: clean up duplicate option fields

The HLSContext struct contains fields which duplicate the data stored in the
avio_opts field. This change removes those fields in favor of avio_opts, and
updates the code accordingly.
The original patch caused the buffer pointed to by new_cookies in open_url to be
leaked. The only thing that buffer is used for is to store the value until it
can be passed to av_dict_set. To fix the leak, v2 of the patch simply calls
av_dict_set with the AV_DICT_DONT_STRDUP_VAL flag, so that the dictionary takes
ownership of the memory instead of copying it again.

Reviewed-by: Steven Liu <lq@chinaffmpeg.org>
Signed-off-by: Richard Shaffer <rshaffer@tunein.com>
libavformat/hls.c