[FFmpeg-cvslog] avcodec/libutvideodec: Try to fix build failure with old libutvideo

Michael Niedermayer git at videolan.org
Wed Oct 29 13:20:17 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 29 13:15:26 2014 +0100| [0c42f47e383fc8e1e351e7d256803ffd2b2837d1] | committer: Michael Niedermayer

avcodec/libutvideodec: Try to fix build failure with old libutvideo

Found-by: Jan Ehrhardt <phpdev at ehrhardt.nl>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/libutvideodec.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/libutvideodec.cpp b/libavcodec/libutvideodec.cpp
index 1e3e612..e4b87a8 100644
--- a/libavcodec/libutvideodec.cpp
+++ b/libavcodec/libutvideodec.cpp
@@ -94,8 +94,10 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
 
     /* Only allocate the buffer once */
     utv->buf_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
+#ifdef UTVF_UQY2
     if (format == UTVF_v210)
         utv->buf_size += avctx->height * ((avctx->width + 47) / 48) * 128; // the linesize used by the decoder, this does not seem to be exported
+#endif
     utv->buffer = (uint8_t *)av_malloc(utv->buf_size * sizeof(uint8_t));
 
     if (utv->buffer == NULL) {



More information about the ffmpeg-cvslog mailing list