[FFmpeg-cvslog] Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
Michael Niedermayer
git at videolan.org
Fri Nov 1 19:40:15 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 19:34:19 2013 +0100| [04894ef32e325e33d420e15c16e3714e0f95fdb0] | committer: Michael Niedermayer
Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
rtpenc: Add a rtpflag option for sending BYE packets when finishing
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04894ef32e325e33d420e15c16e3714e0f95fdb0
---
More information about the ffmpeg-cvslog
mailing list