for #711, support prefile for transcode. 3.0.12

This commit is contained in:
winlin
2017-01-06 10:39:37 +08:00
parent 35cd4c407c
commit 4709d0214c
8 changed files with 84 additions and 28 deletions

24
trunk/.gitignore vendored
View File

@@ -1,25 +1,13 @@
console*.conf
doc/frozen.2Mbps.1644x1028.flv
doc/frozen.500Kbps.766x480.flv
doc/kungfupanda3-tlr1_h1080p.200kbps.flv
doc/kungfupanda3-tlr1_h1080p.300kbps.flv
doc/kungfupanda3-tlr1_h1080p.400kbps.flv
doc/kungfupanda3-tlr1_h1080p.500kbps.flv
doc/kungfupanda3-tlr1_h1080p.600kbps.flv
doc/kungfupanda3-tlr1_h1080p.700kbps.flv
doc/kungfupanda3-tlr1_h1080p.800kbps.flv
doc/kungfupanda3-tlr1_h1080p.8mbps.flv
doc/kungfupanda3-tlr1_h1080p.900kbps.flv
doc/time.300kbps.flv
edge.conf
*.conf
doc/frozen*.flv
doc/kungfupanda*.flv
doc/time*.flv
html
ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcshareddata/
ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/
ide/srs_xcode/srs_xcode.xcodeproj/xcuserdata/
ingest.conf
origin.conf
research/aac/
research/api-server/.idea/
.idea/
research/api-server/static-dir/mse
research/bat/
research/big/
@@ -33,10 +21,8 @@ research/golang/temp.flv
research/librtmp/720p.h264.raw
research/librtmp/test.h264
research/licenser/
research/players/.idea/
research/players/fls_player/
research/players/mic/
research/players/srs_player/.idea/
research/proxy/
research/redis-ocluster/
research/rtmfp/