History

avformat/crypto: fix variable shadowing

Marvin Scholz committed 2 years ago

Commit 074bf9f1 parent 24711b01 file · +2 −2Browse files

Unified · Split

libavformat/crypto.c+2−2
@@ -62,7 +62,7 @@ typedef struct CryptoContext { · 61 unmodified lines
62#define OFFSET(x) offsetof(CryptoContext, x)62#define OFFSET(x) offsetof(CryptoContext, x)
63#define D AV_OPT_FLAG_DECODING_PARAM63#define D AV_OPT_FLAG_DECODING_PARAM
64#define E AV_OPT_FLAG_ENCODING_PARAM64#define E AV_OPT_FLAG_ENCODING_PARAM
65static const AVOption options[] = {65static const AVOption crypto_options[] = {
66 {"key", "AES encryption/decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, .flags = D|E },66 {"key", "AES encryption/decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, .flags = D|E },
67 {"iv", "AES encryption/decryption initialization vector", OFFSET(iv), AV_OPT_TYPE_BINARY, .flags = D|E },67 {"iv", "AES encryption/decryption initialization vector", OFFSET(iv), AV_OPT_TYPE_BINARY, .flags = D|E },
68 {"decryption_key", "AES decryption key", OFFSET(decrypt_key), AV_OPT_TYPE_BINARY, .flags = D },68 {"decryption_key", "AES decryption key", OFFSET(decrypt_key), AV_OPT_TYPE_BINARY, .flags = D },
@@ -75,7 +75,7 @@ static const AVOption options[] = { · 6 unmodified lines
75static const AVClass crypto_class = {75static const AVClass crypto_class = {
76 .class_name = "crypto",76 .class_name = "crypto",
77 .item_name = av_default_item_name,77 .item_name = av_default_item_name,
78 .option = options,78 .option = crypto_options,
79 .version = LIBAVUTIL_VERSION_INT,79 .version = LIBAVUTIL_VERSION_INT,
80};80};
81 81

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t