summaryrefslogtreecommitdiff
path: root/src
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
commit6f70d55c07bbbedee43f8719d82c93275e709f64 (patch)
treeaadc97feada5f99aeb9bb4532cbb80d1dcec3b59 /src
parent27a86218e1f9a1ae7d88833c0b8bd08d0547b4c2 (diff)
downloadxine-lib-6f70d55c07bbbedee43f8719d82c93275e709f64.tar.gz
xine-lib-6f70d55c07bbbedee43f8719d82c93275e709f64.tar.bz2
Fixed decoding of full range YUV420 H.264 videos (segfault). Might still need color space conversion ...
Diffstat (limited to 'src')
-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 0b7c2222c..951116e3d 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -823,7 +823,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 {