diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-05-28 11:25:01 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-05-28 11:25:01 +0300 |
| commit | eab5daf428d1f6fe5068badaadcc3c278a4f1dcf (patch) | |
| tree | 034f6260cd739d3713388aee97b7cf501e4b453a | |
| parent | 3e460bf2e653cf8b8372290b03e3b5255fd65e4a (diff) | |
| parent | 692d551033ecb9cba7864c72f51b9c5c7c6b9daf (diff) | |
| download | xine-lib-eab5daf428d1f6fe5068badaadcc3c278a4f1dcf.tar.gz xine-lib-eab5daf428d1f6fe5068badaadcc3c278a4f1dcf.tar.bz2 | |
Merge from 1.1
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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;} |