[SCM] libav/experimental: tiff: Replace deprecated PIX_FMT names by modern ones

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:04:08 UTC 2014


The following commit has been merged in the experimental branch:
commit df507d5aa063c2ce31fac9f76c6f3bbe9a20c445
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Aug 2 08:47:46 2014 -0700

    tiff: Replace deprecated PIX_FMT names by modern ones

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 6c72dc8..6afc2cb 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -635,13 +635,13 @@ static int decode_frame(AVCodecContext *avctx,
         dst   = p->data[0];
         soff  = s->bpp >> 3;
         ssize = s->width * soff;
-        if (s->avctx->pix_fmt == PIX_FMT_RGB48LE) {
+        if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE) {
             for (i = 0; i < s->height; i++) {
                 for (j = soff; j < ssize; j += 2)
                     AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff));
                 dst += stride;
             }
-        } else if (s->avctx->pix_fmt == PIX_FMT_RGB48BE) {
+        } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE) {
             for (i = 0; i < s->height; i++) {
                 for (j = soff; j < ssize; j += 2)
                     AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff));

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list