Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg

chenshijun

2019-10-29 4587f8d5507300782e329f9527f35f905f3bb697

 godecjpeg.go

@@ -23,7 +23,7 @@

   var width C.int
   var height C.int
   p := C.wrap_fn_decode(in, C.int(withGB), &width, &height)
   p := C.wrap_fn_decode(unsafe.Pointer(libcffmpeg), in, C.int(withGB), &width, &height)
   defer C.free(p)

   if width > 0 && height > 0 {