1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 7ef515cda5 Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
  libavformat: Add a muxer wrapping mpegts encoding into RTP

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 02:49:36 +01:00
..
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-12-01 00:31:06 +01:00
2014-12-18 00:10:35 +01:00
2014-10-20 10:38:38 +01:00
2014-12-09 19:58:56 +01:00
2014-12-18 00:10:35 +01:00
2014-11-04 14:11:53 +01:00
2014-10-20 10:38:37 +01:00
2014-12-16 23:37:24 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-11-06 09:05:37 +01:00
2014-12-02 11:40:01 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 23:11:37 +02:00
2014-12-18 23:11:37 +02:00
2014-10-21 03:52:27 +02:00
2014-10-24 09:53:45 +03:00
2014-10-22 23:12:38 +02:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00
2014-12-18 00:10:35 +01:00