diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 17:48:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 17:48:47 +0100 |
| commit | 7f019129e1bdeeb7fd0af05dc002b133df530f03 (patch) | |
| tree | 75e3953c29f71faab22ae4cffc69e5d8acc405a2 /libavformat/allformats.c | |
| parent | 94a80e36d307a5fbd8f2df1fa0cf8699bfad0ac9 (diff) | |
| parent | 0c5f839693da2276c2da23400f67a67be4ea0af1 (diff) | |
| download | ffmpeg-7f019129e1bdeeb7fd0af05dc002b133df530f03.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Remove a now useless parameter to ffurl_register_protocol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 20f48c04e8..781e4c488a 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -45,8 +45,7 @@ { \ extern URLProtocol ff_##x##_protocol; \ if (CONFIG_##X##_PROTOCOL) \ - ffurl_register_protocol(&ff_##x##_protocol, \ - sizeof(ff_##x##_protocol)); \ + ffurl_register_protocol(&ff_##x##_protocol); \ } void av_register_all(void) |