From ee7f8b278836b0fca2a07b9a413dd25d7e10c88e Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Thu, 19 Apr 2012 09:26:04 +0300
Subject: Fixed decoding of full range YUV420 H.264 videos (segfault). Might
 still need color space conversion ...

---
 src/combined/ffmpeg/ff_video_decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 379732a82..a1ad1cbde 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -828,7 +828,7 @@ static void ff_convert_frame(ff_video_decoder_t *this, vo_frame_t *img) {
       du += img->pitches[1];
       dv += img->pitches[2];
 
-      if (this->context->pix_fmt != PIX_FMT_YUV420P) {
+      if (this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P) {
         su += 2*this->av_frame->linesize[1];
         sv += 2*this->av_frame->linesize[2];
       } else {
-- 
cgit v1.2.3