Commit e96fb980 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/format: move mime_type_opt declaration to where its used

also remove a related dead store
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 27123a77
...@@ -243,7 +243,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, ...@@ -243,7 +243,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
int ret = 0, probe_size, buf_offset = 0; int ret = 0, probe_size, buf_offset = 0;
int score = 0; int score = 0;
int ret2; int ret2;
uint8_t *mime_type_opt = NULL;
if (!max_probe_size) if (!max_probe_size)
max_probe_size = PROBE_BUF_MAX; max_probe_size = PROBE_BUF_MAX;
...@@ -257,9 +256,9 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, ...@@ -257,9 +256,9 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
return AVERROR(EINVAL); return AVERROR(EINVAL);
if (pb->av_class) { if (pb->av_class) {
uint8_t *mime_type_opt = NULL;
av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt); av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt);
pd.mime_type = (const char *)mime_type_opt; pd.mime_type = (const char *)mime_type_opt;
mime_type_opt = NULL;
} }
#if 0 #if 0
if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment