[SCM] libav/experimental: buffersrc: avoid using AV_PIX_FMT_NB

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:15 UTC 2014


The following commit has been merged in the experimental branch:
commit b03b2d86aa9d79670825b42d8a8a7c41f59cb444
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sat May 24 11:15:15 2014 +0200

    buffersrc: avoid using AV_PIX_FMT_NB
    
    That hardcodes the number of pixel formats into lavfi and will break
    when a shared lavu is updated, adding new pixel formats.

diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 480dca9..00e28f8 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -264,7 +264,7 @@ static av_cold int init_video(AVFilterContext *ctx)
     if ((c->pix_fmt = av_get_pix_fmt(c->pix_fmt_str)) == AV_PIX_FMT_NONE) {
         char *tail;
         c->pix_fmt = strtol(c->pix_fmt_str, &tail, 10);
-        if (*tail || c->pix_fmt < 0 || c->pix_fmt >= AV_PIX_FMT_NB) {
+        if (*tail || c->pix_fmt < 0 || !av_pix_fmt_desc_get(c->pix_fmt)) {
             av_log(ctx, AV_LOG_ERROR, "Invalid pixel format string '%s'\n", c->pix_fmt_str);
             return AVERROR(EINVAL);
         }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list