ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Dec 18 
19:58:59 2014 +0100| [4d5ca069c775b84a302ae295d11b6ce639cfb902] | committer: 
Michael Niedermayer

Merge commit 'f2c614e8c4a935b52bbf86819128d9e797230c20'

* commit 'f2c614e8c4a935b52bbf86819128d9e797230c20':
  srtpproto: fix option flag type

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d5ca069c775b84a302ae295d11b6ce639cfb902
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to