ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu
Jul 30 17:42:19 2015 +0200| [ba12ba859aabfa7153ba397d869db13acdaba340] |
committer: Michael Niedermayer
Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
hls: Save and forward avio options
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba12ba859aabfa7153ba397d869db13acdaba340
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
