mirror of https://bitbucket.org/ausocean/av.git
last update
This commit is contained in:
parent
ff401ee48d
commit
7b50a4e95c
|
@ -145,12 +145,6 @@ func TestFlvOutputFile(t *testing.T) {
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
// Test h264 inputfile to flv format into rtmp using librtmp c wrapper
|
// Test h264 inputfile to flv format into rtmp using librtmp c wrapper
|
||||||
func TestRtmpOutputUsingLibRtmp(t *testing.T){
|
func TestRtmpOutputUsingLibRtmp(t *testing.T){
|
||||||
config := Config{
|
config := Config{
|
||||||
|
|
Loading…
Reference in New Issue