Merge commit 'f2c614e8c4a935b52bbf86819128d9e797230c20'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 18:58:59 +0000 (19:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 18:59:03 +0000 (19:59 +0100)
* commit 'f2c614e8c4a935b52bbf86819128d9e797230c20':
  srtpproto: fix option flag type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/srtpproto.c

Simple merge