summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/combined/ffmpeg/ff_video_decoder.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b540b62f1..aa34541c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,10 @@ xine-lib (1.1.21) ????-??-??
* mpeg-ts fixes and enhancements
* Improved syncing of DVB subtitles
* BluRay support (requires libbluray)
+ * Fix full range YUV (with ffmpeg codecs)
+ * Fix multithreading with recent ffmpeg versions
+ * Fix cropping with ffmpeg codecs
+ * Fix OSD when using OpenGL video output
xine-lib (1.1.20.2) ????-??-??
* Various bug fixes.
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 8e291e22f..4a0fd57dc 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -854,7 +854,7 @@ static void ff_convert_frame(ff_video_decoder_t *this, vo_frame_t *img) {
p = sv, q = dv;
for (x = img->width / 2; x > 0; x--) *q++ = ctab[*p++];
} else {
- p = su, q = sv;
+ p = su, q = du;
for (x = img->width / 2; x > 0; x--) {*q++ = ctab[*p]; p += 2;}
p = sv, q = dv;
for (x = img->width / 2; x > 0; x--) {*q++ = ctab[*p]; p += 2;}