avformat/format: move mime_type_opt declaration to where its used

also remove a related dead store

Michael Niedermayer committed 12 years ago

Commit e96fb981 parent 27123a71 file · +1 −2Browse files

Showing the changes to libavformat/format.c (1 of 1 file). Show all

Unified · Split

libavformat/format.c+1−2

@@ -243,7 +243,6 @@ int av_probe_input_buffer2(AVIOContext pb, AVInputFormat *fmt, · 242 unmodified lines
243	243	int ret = 0, probe_size, buf_offset = 0;
244	244	int score = 0;
245	245	int ret2;
246		− uint8_t *mime_type_opt = NULL;
247	246
248	247	if (!max_probe_size)
249	248	max_probe_size = PROBE_BUF_MAX;
@@ -257,9 +256,9 @@ int av_probe_input_buffer2(AVIOContext pb, AVInputFormat *fmt, · 7 unmodified lines
257	256	return AVERROR(EINVAL);
258	257
259	258	if (pb->av_class) {
	259	+ uint8_t *mime_type_opt = NULL;
260	260	av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt);
261	261	pd.mime_type = (const char *)mime_type_opt;
262		− mime_type_opt = NULL;
263	262	}
264	263	#if 0
265	264	if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) {