aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-26 18:42:29 +0100
committerMans Rullgard <mans@mansr.com>2012-10-27 13:43:44 +0100
commit4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26 (patch)
tree6d936ccbef78b7fc664ced7c2663a9543a327e44 /libavformat
parentcc64ec570c92fe39db3f1db8c877a8cc70e3b668 (diff)
downloadffmpeg-4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26.tar.gz
avio: fix pointer type mismatches in avio_enum_protocols()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 45ee86688f..a43b241399 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -85,11 +85,11 @@ const AVClass ffurl_context_class = {
const char *avio_enum_protocols(void **opaque, int output)
{
- URLProtocol **p = opaque;
- *p = ffurl_protocol_next(*p);
- if (!*p) return NULL;
- if ((output && (*p)->url_write) || (!output && (*p)->url_read))
- return (*p)->name;
+ URLProtocol *p;
+ *opaque = ffurl_protocol_next(*opaque);
+ if (!(p = *opaque)) return NULL;
+ if ((output && p->url_write) || (!output && p->url_read))
+ return p->name;
return avio_enum_protocols(opaque, output);
}