eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-04 13:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ee44cb3c81a9e471935ced59bee3d5ff51a1fcbe
ffmpeg/libavformat/hls.c
Michael Niedermayer ba12ba859a Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744' 
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-30 17:52:23 +02:00

61 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink