summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2023-01-15 12:53:31 +0100
committerStefano Sabatini <stefasab@gmail.com>2023-02-11 17:49:01 +0100
commiteac4324bfbe452f0292b48b2f1dc37b5052ec0be (patch)
tree71586dbc8685f2ec1f8f215b2b88acb2727a9774
parent7a53ae931d3cac6f78993ba5480efd684a835cbc (diff)
downloadffmpeg-eac4324bfbe452f0292b48b2f1dc37b5052ec0be.tar.gz
examples: rename muxing to mux
-rwxr-xr-xconfigure4
-rw-r--r--doc/examples/Makefile2
-rw-r--r--doc/examples/Makefile.example2
-rw-r--r--doc/examples/encode_video.c2
-rw-r--r--doc/examples/mux.c (renamed from doc/examples/muxing.c)2
5 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index 6d4e184241..71c92e1e6d 100755
--- a/configure
+++ b/configure
@@ -1723,7 +1723,7 @@ EXAMPLE_LIST="
extract_mvs_example
filter_audio_example
hw_decode_example
- muxing_example
+ mux_example
qsvdec_example
remuxing_example
resampling_audio_example
@@ -3787,7 +3787,7 @@ encode_video_example_deps="avcodec avutil"
extract_mvs_example_deps="avcodec avformat avutil"
filter_audio_example_deps="avfilter avutil"
hw_decode_example_deps="avcodec avformat avutil"
-muxing_example_deps="avcodec avformat avutil swscale"
+mux_example_deps="avcodec avformat avutil swscale"
qsvdec_example_deps="avcodec avutil libmfx h264_qsv_decoder"
remuxing_example_deps="avcodec avformat avutil"
resampling_audio_example_deps="avutil swresample"
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 44a56dd84d..c91d26e4a0 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -11,7 +11,7 @@ EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE) += encode_video
EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE) += extract_mvs
EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio
EXAMPLES-$(CONFIG_HW_DECODE_EXAMPLE) += hw_decode
-EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing
+EXAMPLES-$(CONFIG_MUX_EXAMPLE) += mux
EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE) += qsvdec
EXAMPLES-$(CONFIG_REMUXING_EXAMPLE) += remuxing
EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio
diff --git a/doc/examples/Makefile.example b/doc/examples/Makefile.example
index db09ceddd1..920c7a2362 100644
--- a/doc/examples/Makefile.example
+++ b/doc/examples/Makefile.example
@@ -24,7 +24,7 @@ EXAMPLES=\
encode_video \
extract_mvs \
hw_decode \
- muxing \
+ mux \
remuxing \
resampling_audio \
scaling_video \
diff --git a/doc/examples/encode_video.c b/doc/examples/encode_video.c
index 939ed68324..6c3a3f5684 100644
--- a/doc/examples/encode_video.c
+++ b/doc/examples/encode_video.c
@@ -202,7 +202,7 @@ int main(int argc, char **argv)
It makes only sense because this tiny examples writes packets
directly. This is called "elementary stream" and only works for some
codecs. To create a valid file, you usually need to write packets
- into a proper file format or protocol; see muxing.c.
+ into a proper file format or protocol; see mux.c.
*/
if (codec->id == AV_CODEC_ID_MPEG1VIDEO || codec->id == AV_CODEC_ID_MPEG2VIDEO)
fwrite(endcode, 1, sizeof(endcode), f);
diff --git a/doc/examples/muxing.c b/doc/examples/mux.c
index cd997d5431..e3062c5003 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/mux.c
@@ -26,7 +26,7 @@
*
* Output a media file in any supported libavformat format. The default
* codecs are used.
- * @example muxing.c
+ * @example mux.c
*/
#include <stdlib.h>