The branch, master has been updated
       via  187f5cbb71e74eb1b0bcdfe8c1ea1bb53850149d (commit)
      from  6fb6fd2034de03945ff1f070489f4bc96b69d556 (commit)


- Log -----------------------------------------------------------------
commit 187f5cbb71e74eb1b0bcdfe8c1ea1bb53850149d
Author:     Thomas Volkert <thomas.volk...@net-zeal.com>
AuthorDate: Wed Jun 10 14:45:31 2020 +0200
Commit:     Thomas Volkert <thomas.volk...@net-zeal.com>
CommitDate: Wed Jun 10 14:45:31 2020 +0200

    Revert "web/consulting: updated my text and mail address"
    
    This reverts commit 6fb6fd2034de03945ff1f070489f4bc96b69d556.

diff --git a/src/consulting b/src/consulting
index edb1ee1..bd4fded 100644
--- a/src/consulting
+++ b/src/consulting
@@ -124,12 +124,11 @@ E.g.:
     <div class="well">
       <h3>Thomas Volkert</h3>
       <p>
-        Thomas is located near Stuttgart, Germany. He works with FFmpeg since 
-        2008 and is maintainer since 2014. His main focus is on individual 
software 
-        solutions in C++/C#/C for video/audio streaming/processing. He is 
familiar 
-        with MPEG-TS, FLV, RTP/RTCP/RTSP(S)/SDP/SIP, RTMP(S), HLS and SRT. His 
special 
-        expertise is in designing/developing of network protocols for 
distributed systems. 
-        You can contact him via <a 
href="mailto:thomas.volk...@net-zeal.com</a>.
+        Thomas is located near Stuttgart, Germany. He works with FFmpeg since
+        2008 and is a maintainer since 2014. The focus of his work is on 
network
+        protocols and all areas of audio/video streaming. He has special 
expertise
+        with RTP, RTCP, RTSP, RTMP, HLS and also SDP. You can contact him by 
email at
+        <a 
href="mailto:tho...@homer-conferencing.com";>tho...@homer-conferencing.com</a>.
       </p>
     </div> <!-- well -->
   </div> <!-- col -->

-----------------------------------------------------------------------

Summary of changes:
 src/consulting | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to