diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 19:50:39 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 19:51:10 +0300 |
| commit | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (patch) | |
| tree | e24939addbed549191606f8b6927b29b42c18394 /libavformat/rtmpproto.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/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index a5485ab9e8..ee8c8a6faa 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -3110,7 +3110,7 @@ static const AVClass flavor##_class = { \ .version = LIBAVUTIL_VERSION_INT, \ }; \ \ -URLProtocol ff_##flavor##_protocol = { \ +const URLProtocol ff_##flavor##_protocol = { \ .name = #flavor, \ .url_open = rtmp_open, \ .url_read = rtmp_read, \ |