diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:50:39 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:51:10 +0000 |
| commit | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (patch) | |
| tree | e24939addbed549191606f8b6927b29b42c18394 /libavformat/librtmp.c | |
| parent | e3461197b1ffa0b4ebb80ee3d8567d3b286d7fc3 (diff) | |
| parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) | |
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/librtmp.c')
| -rw-r--r-- | libavformat/librtmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index bfa9a718f1..0fea675b38 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -337,7 +337,7 @@ static const AVClass lib ## flavor ## _class = {\ }; RTMP_CLASS(rtmp) -URLProtocol ff_librtmp_protocol = { +const URLProtocol ff_librtmp_protocol = { .name = "rtmp", .url_open = rtmp_open, .url_read = rtmp_read, @@ -352,7 +352,7 @@ URLProtocol ff_librtmp_protocol = { }; RTMP_CLASS(rtmpt) -URLProtocol ff_librtmpt_protocol = { +const URLProtocol ff_librtmpt_protocol = { .name = "rtmpt", .url_open = rtmp_open, .url_read = rtmp_read, @@ -367,7 +367,7 @@ URLProtocol ff_librtmpt_protocol = { }; RTMP_CLASS(rtmpe) -URLProtocol ff_librtmpe_protocol = { +const URLProtocol ff_librtmpe_protocol = { .name = "rtmpe", .url_open = rtmp_open, .url_read = rtmp_read, @@ -382,7 +382,7 @@ URLProtocol ff_librtmpe_protocol = { }; RTMP_CLASS(rtmpte) -URLProtocol ff_librtmpte_protocol = { +const URLProtocol ff_librtmpte_protocol = { .name = "rtmpte", .url_open = rtmp_open, .url_read = rtmp_read, @@ -397,7 +397,7 @@ URLProtocol ff_librtmpte_protocol = { }; RTMP_CLASS(rtmps) -URLProtocol ff_librtmps_protocol = { +const URLProtocol ff_librtmps_protocol = { .name = "rtmps", .url_open = rtmp_open, .url_read = rtmp_read, |