[FFmpeg-cvslog] avfilter/formats: Update outdated comment

Andreas Rheinhardt git at videolan.org
Sat Oct 2 17:59:21 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Sep 27 03:24:18 2021 +0200| [797fefa2e51e57b87ec5b13849465437acc75164] | committer: Andreas Rheinhardt

avfilter/formats: Update outdated comment

Forgotten in 06754f7bbf341062581accc27b5cce353e99fd82.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavfilter/formats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 29e318aa3b..ec3b8ebd8d 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -58,7 +58,7 @@ do {                                                                       \
  * If check is set, nothing is modified and it is only checked whether
  * the formats are compatible.
  * If empty_allowed is set and one of a,b->nb is zero, the lists are
- * merged; otherwise, it is treated as error.
+ * merged; otherwise, 0 (for nonmergeability) is returned.
  */
 #define MERGE_FORMATS(a, b, fmts, nb, type, check, empty_allowed)          \
 do {                                                                       \



More information about the ffmpeg-cvslog mailing list