[SCM] libav/experimental: Use bpp from header in error message

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a21711022e893919654a9cdbd26c4bd50b5b3f41
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Fri Nov 3 04:42:11 2006 +0000

    Use bpp from header in error message
    
    Originally committed as revision 6878 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 4f83bb6..c3d6010 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -129,7 +129,7 @@ static int decode_frame(AVCodecContext *avctx,
         avctx->pix_fmt = PIX_FMT_BGR24;
         break;
     default:
-        av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", avctx->bits_per_sample);
+        av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", s->bpp);
         return -1;
     }
 

-- 
Libav/FFmpeg packaging