[FFmpeg-cvslog] Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'

Michael Niedermayer git at videolan.org
Thu Jul 30 18:05:30 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at 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 <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba12ba859aabfa7153ba397d869db13acdaba340
---





More information about the ffmpeg-cvslog mailing list