summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2012-04-19 09:26:04 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2012-04-19 09:26:04 +0300
commitee7f8b278836b0fca2a07b9a413dd25d7e10c88e (patch)
treed32c71e8c0082337bb12d813437fb4b824662b75
parent93e8da81f50c7c3d5c5d24fb997ec8ff067084dd (diff)
downloadxine-lib-ee7f8b278836b0fca2a07b9a413dd25d7e10c88e.tar.gz
xine-lib-ee7f8b278836b0fca2a07b9a413dd25d7e10c88e.tar.bz2
Fixed decoding of full range YUV420 H.264 videos (segfault). Might still need color space conversion ...
-rw-r--r--src/combined/ffmpeg/ff_video_decoder.c2
1 files changed, 1 insertions, 1 deletions
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 {