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/concat.c | |
| parent | e3461197b1ffa0b4ebb80ee3d8567d3b286d7fc3 (diff) | |
| parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) | |
| download | ffmpeg-9c75148e6ebc88a0501e3d0242defb6dbdc3c23d.tar.gz | |
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/concat.c')
| -rw-r--r-- | libavformat/concat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/concat.c b/libavformat/concat.c index 7a8eb1be9e..190f36d43a 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -186,7 +186,7 @@ static int64_t concat_seek(URLContext *h, int64_t pos, int whence) return result; } -URLProtocol ff_concat_protocol = { +const URLProtocol ff_concat_protocol = { .name = "concat", .url_open = concat_open, .url_read = concat_read, |