From a05c363b7fc89a41176072709c3f4ba018d8bf09 Mon Sep 17 00:00:00 2001 From: llyyr Date: Sat, 20 Jan 2024 00:16:20 +0530 Subject: [PATCH] chmap: mp_image_pool: drop stale mentions of Libav in comments --- audio/chmap.c | 8 ++++---- video/mp_image_pool.c | 2 +- 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 . -// Speakers not representable by ffmpeg/libav are dropped. +// Return the ffmpeg channel layout as in . +// 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 . +// Return the ffmpeg channel layout as in . // 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 // . // 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)