summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorllyyr <llyyr.public@gmail.com>2024-01-20 00:16:20 +0530
committerDudemanguy <random342@airmail.cc>2024-01-20 16:10:20 +0000
commita05c363b7fc89a41176072709c3f4ba018d8bf09 (patch)
tree2ec9dc49ac04861aa62d8339a0659185e4b7d461
parent8fe2af09f18d83986d39961ce3469fa8857607d7 (diff)
downloadmpv-a05c363b7fc89a41176072709c3f4ba018d8bf09.tar.bz2
mpv-a05c363b7fc89a41176072709c3f4ba018d8bf09.tar.xz
chmap: mp_image_pool: drop stale mentions of Libav in comments
-rw-r--r--audio/chmap.c8
-rw-r--r--video/mp_image_pool.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/audio/chmap.c b/audio/chmap.c
index e2b95f4bd8..a56d78dfe2 100644
--- a/audio/chmap.c
+++ b/audio/chmap.c
@@ -239,8 +239,8 @@ void mp_chmap_set_unknown(struct mp_chmap *dst, int num_channels)
}
}
-// Return the ffmpeg/libav channel layout as in <libavutil/channel_layout.h>.
-// Speakers not representable by ffmpeg/libav are dropped.
+// Return the ffmpeg channel layout as in <libavutil/channel_layout.h>.
+// Speakers not representable by ffmpeg are dropped.
// Warning: this ignores the order of the channels, and will return a channel
// mask even if the order is different from libavcodec's.
// Also, "unknown" channel maps are translated to non-sense channel
@@ -263,7 +263,7 @@ uint64_t mp_chmap_to_lavc_unchecked(const struct mp_chmap *src)
return mask;
}
-// Return the ffmpeg/libav channel layout as in <libavutil/channel_layout.h>.
+// Return the ffmpeg channel layout as in <libavutil/channel_layout.h>.
// Returns 0 if the channel order doesn't match lavc's or if it's invalid.
uint64_t mp_chmap_to_lavc(const struct mp_chmap *src)
{
@@ -272,7 +272,7 @@ uint64_t mp_chmap_to_lavc(const struct mp_chmap *src)
return mp_chmap_to_lavc_unchecked(src);
}
-// Set channel map from the ffmpeg/libav channel layout as in
+// Set channel map from the ffmpeg channel layout as in
// <libavutil/channel_layout.h>.
// If the number of channels exceed MP_NUM_CHANNELS, set dst to empty.
void mp_chmap_from_lavc(struct mp_chmap *dst, uint64_t src)
diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c
index 0b5e520e10..922854a7d1 100644
--- a/video/mp_image_pool.c
+++ b/video/mp_image_pool.c
@@ -337,7 +337,7 @@ bool mp_image_hw_upload(struct mp_image *hw_img, struct mp_image *src)
AVFrame *srcav = NULL;
// This means the destination image will not be "writable", which would be
- // a pain if Libav enforced this - fortunately it doesn't care. We can
+ // a pain if FFmpeg enforced this - fortunately it doesn't care. We can
// transfer data to it even if there are multiple refs.
dstav = mp_image_to_av_frame(hw_img);
if (!dstav)