diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2014-08-17 18:17:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 21:56:15 +0200 |
| commit | f3c8a8b087d08019604fd641970b49144cc3dfa2 (patch) | |
| tree | 291a556a5c74225a244896f333ef9c0e8c3bb3f5 /libavcodec/lcldec.c | |
| parent | 60f94f708414b187724d42e904b1b3aabe24ad85 (diff) | |
| download | ffmpeg-n1.1.14.tar.gz | |
avcodec/lcldec: fix decoding of YUV444 samplen1.1.14
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a3329a09f93455a44ff3c9c64886c4da1f66bcfb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lcldec.c')
| -rw-r--r-- | libavcodec/lcldec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 5708a12d3d..68930186d9 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); |