← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libswscale/output.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswscale/output.c
450
450
        dest[pos + 1] = U;  \
451
451
        dest[pos + 2] = Y2; \
452
452
        dest[pos + 3] = V;  \
453
 
    } else { \
 
453
    } else if (target == AV_PIX_FMT_YVYU422) { \
 
454
        dest[pos + 0] = Y1; \
 
455
        dest[pos + 1] = V;  \
 
456
        dest[pos + 2] = Y2; \
 
457
        dest[pos + 3] = U;  \
 
458
    } else { /* AV_PIX_FMT_UYVY422 */ \
454
459
        dest[pos + 0] = U;  \
455
460
        dest[pos + 1] = Y1; \
456
461
        dest[pos + 2] = V;  \
569
574
#undef output_pixels
570
575
 
571
576
YUV2PACKEDWRAPPER(yuv2, 422, yuyv422, AV_PIX_FMT_YUYV422)
 
577
YUV2PACKEDWRAPPER(yuv2, 422, yvyu422, AV_PIX_FMT_YVYU422)
572
578
YUV2PACKEDWRAPPER(yuv2, 422, uyvy422, AV_PIX_FMT_UYVY422)
573
579
 
574
580
#define R_B ((target == AV_PIX_FMT_RGB48LE || target == AV_PIX_FMT_RGB48BE) ? R : B)
1576
1582
        *yuv2packed2 = yuv2yuyv422_2_c;
1577
1583
        *yuv2packedX = yuv2yuyv422_X_c;
1578
1584
        break;
 
1585
    case AV_PIX_FMT_YVYU422:
 
1586
        *yuv2packed1 = yuv2yvyu422_1_c;
 
1587
        *yuv2packed2 = yuv2yvyu422_2_c;
 
1588
        *yuv2packedX = yuv2yvyu422_X_c;
 
1589
        break;
1579
1590
    case AV_PIX_FMT_UYVY422:
1580
1591
        *yuv2packed1 = yuv2uyvy422_1_c;
1581
1592
        *yuv2packed2 = yuv2uyvy422_2_c;