[FFmpeg-cvslog] avcodec/lcldec: fix decoding of YUV444 sample

Piotr Bandurski git at videolan.org
Sat Aug 30 22:11:53 CEST 2014


ffmpeg | branch: release/1.1 | Piotr Bandurski <ami_stuff at o2.pl> | Sun Aug 17 18:17:13 2014 +0200| [f3c8a8b087d08019604fd641970b49144cc3dfa2] | committer: Michael Niedermayer

avcodec/lcldec: fix decoding of YUV444 sample

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a3329a09f93455a44ff3c9c64886c4da1f66bcfb)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/lcldec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 5708a12..6893018 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -199,7 +199,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
     case AV_CODEC_ID_MSZH:
         switch (c->compression) {
         case COMP_MSZH:
-            if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3) {
+            if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3 ||
+                c->imgtype == IMGTYPE_YUV111 && len == width * height * 3) {
                 ;
             } else if (c->flags & FLAG_MULTITHREAD) {
                 mthread_inlen = AV_RL32(encoded);



More information about the ffmpeg-cvslog mailing list