[FFmpeg-cvslog] Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
Michael Niedermayer
git at videolan.org
Fri Dec 19 02:56:38 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ef515cda5fdfa5800a9336a128bff1f1b85edea
---
More information about the ffmpeg-cvslog
mailing list