generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/format: move mime_type_opt declaration to where its used

Browse Source 
also remove a related dead store

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-10 03:08:11 +02:00
parent 27123a77c1
commit e96fb980dc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/format.c
View File

@@ -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,
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) {