mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 21:48:55 +00:00
gst/ffmpegcolorspace/imgconvert.c: Actually test for odd width/height rather than testing whether a temporary variabl...
Original commit message from CVS: * gst/ffmpegcolorspace/imgconvert.c: (yuv420p_to_yuv422): Actually test for odd width/height rather than testing whether a temporary variable that was 0 before we subtracted 1 is now not equal to zero (which it always is).
This commit is contained in:
parent
8a9f4e57f7
commit
ed9cc50f01
2 changed files with 10 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2004-11-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* gst/ffmpegcolorspace/imgconvert.c: (yuv420p_to_yuv422):
|
||||||
|
Actually test for odd width/height rather than testing whether
|
||||||
|
a temporary variable that was 0 before we subtracted 1 is now
|
||||||
|
not equal to zero (which it always is).
|
||||||
|
|
||||||
2004-11-11 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
2004-11-11 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
* sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported):
|
* sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported):
|
||||||
|
|
|
@ -880,7 +880,7 @@ yuv420p_to_yuv422 (AVPicture * dst, const AVPicture * src,
|
||||||
*line1++ = *line2++ = *cr1++;
|
*line1++ = *line2++ = *cr1++;
|
||||||
}
|
}
|
||||||
/* odd width */
|
/* odd width */
|
||||||
if (w) {
|
if (width % 2 != 0) {
|
||||||
*line1++ = *lum1++;
|
*line1++ = *lum1++;
|
||||||
*line2++ = *lum2++;
|
*line2++ = *lum2++;
|
||||||
*line1++ = *line2++ = *cb1++;
|
*line1++ = *line2++ = *cb1++;
|
||||||
|
@ -892,7 +892,7 @@ yuv420p_to_yuv422 (AVPicture * dst, const AVPicture * src,
|
||||||
cr2 += src->linesize[2];
|
cr2 += src->linesize[2];
|
||||||
}
|
}
|
||||||
/* odd height */
|
/* odd height */
|
||||||
if (h) {
|
if (height % 2 != 0) {
|
||||||
line1 = linesrc;
|
line1 = linesrc;
|
||||||
lum1 = lumsrc;
|
lum1 = lumsrc;
|
||||||
cb1 = cb2;
|
cb1 = cb2;
|
||||||
|
@ -905,7 +905,7 @@ yuv420p_to_yuv422 (AVPicture * dst, const AVPicture * src,
|
||||||
*line1++ = *cr1++;
|
*line1++ = *cr1++;
|
||||||
}
|
}
|
||||||
/* odd width */
|
/* odd width */
|
||||||
if (w) {
|
if (width % 2 != 0) {
|
||||||
*line1++ = *lum1++;
|
*line1++ = *lum1++;
|
||||||
*line1++ = *cb1++;
|
*line1++ = *cb1++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue