diff --git a/app/src/main/java/com/frank/ffmpeg/activity/PushActivity.kt b/app/src/main/java/com/frank/ffmpeg/activity/PushActivity.kt index d24bf46..a2785b8 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/PushActivity.kt +++ b/app/src/main/java/com/frank/ffmpeg/activity/PushActivity.kt @@ -12,7 +12,8 @@ import com.frank.ffmpeg.R import java.io.File /** - * Using FFmpeg to push http-flv stream + * Using FFmpeg to push rtmp stream, + * with SRS media server convert to http-flv stream * Created by frank on 2018/2/2. */ class PushActivity : BaseActivity() { diff --git a/doc/FFmpeg_compile_shell.md b/doc/FFmpeg_compile_shell.md index bdd07f9..5f5dfc0 100644 --- a/doc/FFmpeg_compile_shell.md +++ b/doc/FFmpeg_compile_shell.md @@ -274,7 +274,6 @@ function build_android { --disable-debug \ --disable-doc \ --enable-avfilter \ - --enable-avresample \ --enable-decoders \ $ADDITIONAL_CONFIGURE_FLAG diff --git a/picture/ffmpeg_group.png b/picture/ffmpeg_group.png index b85143e..970b8bc 100644 Binary files a/picture/ffmpeg_group.png and b/picture/ffmpeg_group.png differ