ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19
02:49:36 2014 +0100| [7ef515cda5fdfa5800a9336a128bff1f1b85edea] | committer:
Michael Niedermayer
Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
libavformat: Add a muxer wrapping mpegts encoding into RTP
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ef515cda5fdfa5800a9336a128bff1f1b85edea
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
