[FFmpeg-cvslog] libopenjpegdec: unbreak yuva420p support
Paul B Mahol
git at videolan.org
Sat Jun 9 20:09:11 CEST 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Jun 9 18:06:09 2012 +0000| [a474403229fd0141aa990c154b70dbb525262d99] | committer: Paul B Mahol
libopenjpegdec: unbreak yuva420p support
Regression introduced in b7a928b2d1563575a8d9ec5aa606f735620b38ab.
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a474403229fd0141aa990c154b70dbb525262d99
---
libavcodec/libopenjpegdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 9829e74..3194c68 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -66,8 +66,8 @@ static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum Pix
switch (descriptor.nb_components) {
case 4: match = match && descriptor.comp[3].depth_minus1 + 1 >= image->comps[3].prec &&
- 1 << descriptor.log2_chroma_w == image->comps[3].dx &&
- 1 << descriptor.log2_chroma_h == image->comps[3].dy;
+ 1 == image->comps[3].dx &&
+ 1 == image->comps[3].dy;
case 3: match = match && descriptor.comp[2].depth_minus1 + 1 >= image->comps[2].prec &&
1 << descriptor.log2_chroma_w == image->comps[2].dx &&
1 << descriptor.log2_chroma_h == image->comps[2].dy;
More information about the ffmpeg-cvslog
mailing list