diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:00:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:00:16 +0100 |
| commit | 20899c54f03c413b225e8839a3c5318ab47abe55 (patch) | |
| tree | 97ab034da631a7ff973a63dc7640b2a10b7f102f /libavformat/utils.c | |
| parent | cbe43e62c9ac7d4aefdc13476f6f691bd626525f (diff) | |
| download | ffmpeg-20899c54f03c413b225e8839a3c5318ab47abe55.tar.gz | |
http/utils: rename "demuxer" to mime_type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 62d518798f..28961119fa 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -413,7 +413,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, { AVProbeData pd = { filename ? filename : "", NULL, -offset }; unsigned char *buf = NULL; - uint8_t *demuxer_name; + uint8_t *mime_type; int ret = 0, probe_size, buf_offset = 0; if (!max_probe_size) { @@ -428,8 +428,8 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, return AVERROR(EINVAL); } - if (!*fmt && pb && pb->av_class && av_opt_get(pb, "demuxer", AV_OPT_SEARCH_CHILDREN, &demuxer_name) >= 0 && demuxer_name) { - if (!av_strcasecmp(demuxer_name, "audio/aacp")) { + if (!*fmt && pb && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { + if (!av_strcasecmp(mime_type, "audio/aacp")) { *fmt = av_find_input_format("aac"); } } |