[FFmpeg-cvslog] Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'
Michael Niedermayer
git at videolan.org
Tue Feb 24 22:03:28 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 21:50:32 2015 +0100| [8c1c06937156fb8dba1f1266b985f8671c29f4e2] | committer: Michael Niedermayer
Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'
* commit '04a1be8e28e81f3967eace7705343c450616cc95':
libavformat: add T.140 RTP depacketization (RFC 4103)
Conflicts:
libavformat/rtpdec.c
libavformat/version.h
See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c1c06937156fb8dba1f1266b985f8671c29f4e2
---
More information about the ffmpeg-cvslog
mailing list