diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 03:08:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 03:08:11 +0200 |
| commit | e96fb980dcb658bb8e8a0dac2289a201b68f85b4 (patch) | |
| tree | f4758622e6f0df775b9cb5d29abbf63286d47fbd /libavformat/format.c | |
| parent | 27123a77c111eed272a11791354831961bc6507c (diff) | |
| download | ffmpeg-e96fb980dcb658bb8e8a0dac2289a201b68f85b4.tar.gz | |
avformat/format: move mime_type_opt declaration to where its used
also remove a related dead store
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/format.c')
| -rw-r--r-- | libavformat/format.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/format.c b/libavformat/format.c index 527299d652..3b741ea938 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -243,7 +243,6 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, int ret = 0, probe_size, buf_offset = 0; int score = 0; int ret2; - uint8_t *mime_type_opt = NULL; if (!max_probe_size) max_probe_size = PROBE_BUF_MAX; @@ -257,9 +256,9 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, return AVERROR(EINVAL); if (pb->av_class) { + uint8_t *mime_type_opt = NULL; av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt); pd.mime_type = (const char *)mime_type_opt; - mime_type_opt = NULL; } #if 0 if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { |