Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 01:49:36 +0000 (02:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 01:49:36 +0000 (02:49 +0100)
commit7ef515cda5fdfa5800a9336a128bff1f1b85edea
tree8605cdbc9924dfc7711e00910c731ca8a7d9837a
parent5162af67f41214edacefe05d9723e4a6d9847900
parent8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a
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>
Changelog
libavformat/Makefile
libavformat/allformats.c
libavformat/rtpenc_mpegts.c
libavformat/version.h