diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-21 19:04:30 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-21 19:04:30 +0100 |
| commit | 2be5a79b30766a67f8c59e06a3caf9c3d3acd352 (patch) | |
| tree | bbbab3adfc042748170f475e27b21f10c5772951 | |
| parent | 234c38847028aacb179ddb41cf88a7e7d92b7e48 (diff) | |
| download | xine-lib-2be5a79b30766a67f8c59e06a3caf9c3d3acd352.tar.gz xine-lib-2be5a79b30766a67f8c59e06a3caf9c3d3acd352.tar.bz2 | |
Fix display of some MJPEG streams (YUVJ420P).
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -6,6 +6,7 @@ xine-lib (1.1.12.1) 2008-??-?? - For extra safety against possible Integer overflows like the ones found in CVE-2008-1482, backport more calloc usage from 1.2 branch. * Added MIME types and .mpp for musepack. + * Fixed display of some MJPEG streams (YUVJ420P). xine-lib (1.1.12) 2008-04-14 * Security fixes: diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index d4a355d65..b18040d38 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -156,7 +156,7 @@ static int get_buffer(AVCodecContext *context, AVFrame *av_frame){ avcodec_align_dimensions(context, &width, &height); - if( this->context->pix_fmt != PIX_FMT_YUV420P ) { + if( this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P ) { if (!this->is_direct_rendering_disabled) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n")); |