| Message ID | AM7PR03MB6660EACE6C1DBEA4F62F99888FA79@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 797fefa2e51e57b87ec5b13849465437acc75164 |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avfilter/formats: Don't unnecessarily reget pixfmt descriptor | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
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 { \
Forgotten in 06754f7bbf341062581accc27b5cce353e99fd82. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/formats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)