Gitblit

recent activity last 7 days / 30 commits by 1 authors

13:07	hefan/LiveProject		ffmpeg拉流控制帧率 Runt authored 1f3c36 on master	HEAD master	diff \| tree
08:50	hefan/LiveProject		小窗信息没及时同步问题 Runt authored 082781 on master		diff \| tree

14:00	hefan/LiveProject		Merge branch 'refs/heads/rtmp_write' into mediacodec Runt authored 7a4dd2 on mediacodec	mediacodec	diff \| tree
13:55	hefan/LiveProject		Merge remote-tracking branch 'refs/remotes/origin/master'... Runt authored 90a397 on mediacodec	rtmp_write	diff \| tree
13:33	hefan/LiveProject		png图片问题修复 Runt authored d8e02c on master		diff \| tree
11:00	hefan/LiveProject		视频文件加载 Runt authored 237b08 on master		diff \| tree

17:59	hefan/LiveProject		代码合并，音频合并改回java层， Runt authored d20341 on mediacodec		diff \| tree
15:58	hefan/LiveProject		Merge branch 'refs/heads/rtmp_write' into mediacodec Runt authored 74e626 on mediacodec		diff \| tree
15:24	hefan/LiveProject		Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write Runt authored 668e38 on mediacodec		diff \| tree
14:01	hefan/LiveProject		实时显示帧率 Runt authored 2d1228 on master	rgba	diff \| tree
12:43	hefan/LiveProject		文本阴影 Runt authored c37021 on master		diff \| tree
12:05	hefan/LiveProject		将rgba缓存改为yuv和rgba并用 Runt authored 1d248a on master		diff \| tree
04:49	hefan/LiveProject		文本和图片相关问题修复和优化 Runt authored 1e7a9a on master		diff \| tree

17:07	hefan/LiveProject		Merge branch 'refs/heads/master' into rgba Runt authored 671543 on master		diff \| tree
16:48	hefan/LiveProject		图片功能实现 Runt authored d496a7 on master		diff \| tree
14:05	hefan/LiveProject		Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write Runt authored e3ab39 on mediacodec		diff \| tree
14:04	hefan/LiveProject		文本禁止主界面窗口最小尺寸窗口类型推流帧数 Runt authored cb9156 on master		diff \| tree
13:50	hefan/LiveProject		代码修复 Runt authored c5c65c on master		diff \| tree
13:22	hefan/LiveProject		代码修复 Runt authored 9efd8f on master		diff \| tree
11:46	hefan/LiveProject		Merge remote-tracking branch 'refs/remotes/origin/master' into rgba Runt authored 29dfef on master		diff \| tree
11:16	hefan/LiveProject		修复关闭相机未彻底结束相关数据 Runt authored c3a91b on master		diff \| tree
11:12	hefan/LiveProject		混合声音修复 Runt authored 6c7ae3 on master		diff \| tree
10:49	hefan/LiveProject		部分代码调整 Runt authored 155065 on master		diff \| tree
09:47	hefan/LiveProject		Revert "缓存数据将yuv改为rgba" Runt authored 70ef67 on master		diff \| tree

18:26	hefan/LiveProject		混合声音 Runt authored 707920 on master		diff \| tree
10:00	hefan/LiveProject		边框修复 Runt authored f12bba on master		diff \| tree
08:20	hefan/LiveProject		Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write Runt authored a67b05 on mediacodec		diff \| tree
08:19	hefan/LiveProject		缓存数据将yuv改为rgba Runt authored 6c1d00 on master		diff \| tree

16:26	hefan/LiveProject		Merge remote-tracking branch 'refs/remotes/origin/master' into rtmp_write Runt authored 8a5483 on mediacodec		diff \| tree
16:25	hefan/LiveProject		窗口层级更新导致的bug修复 Runt authored 881d6a on master		diff \| tree