eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0
ffmpeg/libavformat/allformats.c
Michael Niedermayer 641358addc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 10:38:03 +01:00

16 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink