summaryrefslogtreecommitdiffstats
path: root/libavformat/version.h
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-02-14 12:00:49 +0200
committerMartin Storsjö <martin@martin.st>2012-02-14 20:05:32 +0200
commit8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0 (patch)
treee2357084d8c632c275a36b540fb56588678b467d /libavformat/version.h
parent65cd7bf32f384db919b81b07d8e3201d6af4fb06 (diff)
downloadffmpeg-streaming-8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0.zip
ffmpeg-streaming-8bdab32f4ee402bbd7bf5a61b0ccbcc59569bfb0.tar.gz
libavformat: Rename the applehttp protocol to hls
Keep the old protocol name around for backwards compatibility until the next bump. Deprecate the method of implicitly assuming the nested protocol. For applehttp://server/path, it might have felt logical, but supporting hls://server/path isn't quite as intuitive. Therefore only support hls+http://server/path from now on. Using this protocol at all is discouraged, since the hls demuxer is more complete and fits into the architecture better. There have been cases where the protocol implementation worked better than the demuxer, but this should no longer be the case. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/version.h')
-rw-r--r--libavformat/version.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/version.h b/libavformat/version.h
index 6f3b387..443d752 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -50,5 +50,8 @@
#ifndef FF_API_CLOSE_INPUT_FILE
#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif
+#ifndef FF_API_APPLEHTTP_PROTO
+#define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55)
+#endif
#endif /* AVFORMAT_VERSION_H */
OpenPOWER on IntegriCloud