[FFmpeg-cvslog] examples: rename http_multiclient to avio_http_serve_files

Stefano Sabatini git at videolan.org
Sat Feb 11 19:09:49 EET 2023


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sun Jan 15 12:44:04 2023 +0100| [2e4694707e619ddb736489cc32ace997c6788930] | committer: Stefano Sabatini

examples: rename http_multiclient to avio_http_serve_files

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e4694707e619ddb736489cc32ace997c6788930
---

 configure                                                    | 4 ++--
 doc/examples/Makefile                                        | 2 +-
 doc/examples/Makefile.example                                | 5 +++--
 doc/examples/{http_multiclient.c => avio_http_serve_files.c} | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 62b0c196fa..b695c77c58 100755
--- a/configure
+++ b/configure
@@ -1710,6 +1710,7 @@ COMPONENT_LIST="
 "
 
 EXAMPLE_LIST="
+    avio_http_serve_files_example
     avio_list_dir_example
     avio_read_callback_example
     decode_audio_example
@@ -1721,7 +1722,6 @@ EXAMPLE_LIST="
     encode_video_example
     extract_mvs_example
     filter_audio_example
-    http_multiclient_example
     hw_decode_example
     metadata_example
     muxing_example
@@ -3774,6 +3774,7 @@ vstack_vaapi_filter_deps="vaapi_1"
 xstack_vaapi_filter_deps="vaapi_1"
 
 # examples
+avio_http_serve_files_deps="avformat avutil fork"
 avio_list_dir_deps="avformat avutil"
 avio_read_callback_deps="avformat avcodec avutil"
 decode_audio_example_deps="avcodec avutil"
@@ -3785,7 +3786,6 @@ encode_audio_example_deps="avcodec avutil"
 encode_video_example_deps="avcodec avutil"
 extract_mvs_example_deps="avcodec avformat avutil"
 filter_audio_example_deps="avfilter avutil"
-http_multiclient_example_deps="avformat avutil fork"
 hw_decode_example_deps="avcodec avformat avutil"
 metadata_example_deps="avformat avutil"
 muxing_example_deps="avcodec avformat avutil swscale"
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index ba3a3b712a..f640a5e636 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -1,3 +1,4 @@
+EXAMPLES-$(CONFIG_AVIO_HTTP_SERVE_FILES)     += avio_http_serve_files
 EXAMPLES-$(CONFIG_AVIO_LIST_DIR_EXAMPLE)     += avio_list_dir
 EXAMPLES-$(CONFIG_AVIO_READ_CALLBACK_EXAMPLE) += avio_read_callback
 EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE)      += decode_audio
@@ -9,7 +10,6 @@ EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE)      += encode_audio
 EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE)      += encode_video
 EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE)       += extract_mvs
 EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE)      += filter_audio
-EXAMPLES-$(CONFIG_HTTP_MULTICLIENT_EXAMPLE)  += http_multiclient
 EXAMPLES-$(CONFIG_HW_DECODE_EXAMPLE)         += hw_decode
 EXAMPLES-$(CONFIG_METADATA_EXAMPLE)          += metadata
 EXAMPLES-$(CONFIG_MUXING_EXAMPLE)            += muxing
diff --git a/doc/examples/Makefile.example b/doc/examples/Makefile.example
index 3383bb61fe..9e725715a5 100644
--- a/doc/examples/Makefile.example
+++ b/doc/examples/Makefile.example
@@ -11,7 +11,9 @@ CFLAGS += -Wall -g
 CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
 LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
 
-EXAMPLES=       avio_list_dir                      \
+EXAMPLES=\
+                avio_http_serve_files              \
+                avio_list_dir                      \
                 avio_read_callback                 \
                 decode_audio                       \
                 decode_filter_audio                \
@@ -21,7 +23,6 @@ EXAMPLES=       avio_list_dir                      \
                 encode_audio                       \
                 encode_video                       \
                 extract_mvs                        \
-                http_multiclient                   \
                 hw_decode                          \
                 metadata                           \
                 muxing                             \
diff --git a/doc/examples/http_multiclient.c b/doc/examples/avio_http_serve_files.c
similarity index 99%
rename from doc/examples/http_multiclient.c
rename to doc/examples/avio_http_serve_files.c
index 831e89c60a..d6a1d146f3 100644
--- a/doc/examples/http_multiclient.c
+++ b/doc/examples/avio_http_serve_files.c
@@ -24,7 +24,7 @@
  * @file
  * libavformat multi-client network API usage example.
  *
- * @example http_multiclient.c
+ * @example avio_http_serve_files.c
  * This example will serve a file without decoding or demuxing it over http.
  * Multiple clients can connect and will receive the same file.
  */



More information about the ffmpeg-cvslog mailing list