diff --git a/README.md b/README.md index 4d59c3f..cb9b646 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ android端基于FFmpeg库的使用。
- #### IjkPlayer的RTSP超低延时直播 - #### IjkPlayer的RTSP多路投屏直播 -左边是ffplay客户端拉流播放,中间是web网页播放: +拖动进度条预览视频: -![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/gif/live.gif) +![视频](https://github.com/xufuji456/FFmpegAndroid/blob/master/mp4/preview.mp4) 视频添加文字水印(文字白色背景可以改为透明): diff --git a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java index 4668875..3d833cf 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java +++ b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java @@ -129,7 +129,7 @@ public class AudioHandleActivity extends BaseActivity { String concatFile = PATH + File.separator + "concat.mp3"; commandLine = FFmpegUtil.concatAudio(srcFile, appendFile, concatFile); break; - case R.id.btn_mix://混合 + case R.id.btn_mix://混音 if (!FileUtil.checkFileExist(appendFile)){ return; } diff --git a/mp4/preview.mp4 b/mp4/preview.mp4 new file mode 100644 index 0000000..f0d682d Binary files /dev/null and b/mp4/preview.mp4 differ