aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--libavformat/srtpproto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/srtpproto.c b/libavformat/srtpproto.c
index f9d6b1733f..0124696ad0 100644
--- a/libavformat/srtpproto.c
+++ b/libavformat/srtpproto.c
@@ -42,8 +42,8 @@ typedef struct SRTPProtoContext {
static const AVOption options[] = {
{ "srtp_out_suite", "", offsetof(SRTPProtoContext, out_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
{ "srtp_out_params", "", offsetof(SRTPProtoContext, out_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
- { "srtp_in_suite", "", offsetof(SRTPProtoContext, in_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
- { "srtp_in_params", "", offsetof(SRTPProtoContext, in_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
+ { "srtp_in_suite", "", offsetof(SRTPProtoContext, in_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D },
+ { "srtp_in_params", "", offsetof(SRTPProtoContext, in_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D },
{ NULL }
};