opensourcemirror
/
mpv
mirror of https://github.com/mpv-player/mpv.git
1
0
Fork 0
Code Issues Releases Wiki Activity

chmap: mp_image_pool: drop stale mentions of Libav in comments

This commit is contained in:
llyyr 2024-01-20 00:16:20 +05:30 committed by Dudemanguy
parent 8fe2af09f1
commit a05c363b7f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/chmap.c
View File

@ -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)

2
video/mp_image_pool.c
View File

@ -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)