aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-18 19:58:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-18 19:59:03 +0100
commit4d5ca069c775b84a302ae295d11b6ce639cfb902 (patch)
tree062172b99ba7a26fe467e19fc2367aad691d2580 /CREDITS
parent368642361f3a589d7b0c23ea327d988edb434e3f (diff)
parentf2c614e8c4a935b52bbf86819128d9e797230c20 (diff)
downloadffmpeg-4d5ca069c775b84a302ae295d11b6ce639cfb902.tar.gz
Merge commit 'f2c614e8c4a935b52bbf86819128d9e797230c20'
* commit 'f2c614e8c4a935b52bbf86819128d9e797230c20': srtpproto: fix option flag type Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions