Revert r10021, it was committed by accident and is a bit ugly anyway.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10026 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/ffplay.c b/ffplay.c
index 8b631c37dfc7b2933c2cc32118f6299aa4d4e043..ad81e3a093afdc9b9a634bffdb8083d0a444346c 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -422,8 +422,7 @@ void fill_border(VideoState *s, int x, int y, int w, int h, int color)
 
 #define BPP 1
 
-static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh,
-                          float scalex, float scaley)
+static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh)
 {
     int wrap, wrap3, width2, skip2;
     int y, u, v, a, u1, v1, a1, w, h;
@@ -432,9 +431,9 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
     const uint32_t *pal;
     int dstx, dsty, dstw, dsth;
 
-    dstx = FFMIN(scalex * FFMAX(rect->x, 0), imgw);
+    dstx = FFMIN(FFMAX(rect->x, 0), imgw);
     dstw = FFMIN(FFMAX(rect->w, 0), imgw - dstx);
-    dsty = FFMIN(scaley * FFMAX(rect->y, 0), imgh);
+    dsty = FFMIN(FFMAX(rect->y, 0), imgh);
     dsth = FFMIN(FFMAX(rect->h, 0), imgh - dsty);
     lum = dst->data[0] + dsty * dst->linesize[0];
     cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
@@ -700,7 +699,6 @@ static void video_image_display(VideoState *is)
 
                 if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000))
                 {
-                    float scalex = 1, scaley = 1;
                     SDL_LockYUVOverlay (vp->bmp);
 
                     pict.data[0] = vp->bmp->pixels[0];
@@ -711,14 +709,9 @@ static void video_image_display(VideoState *is)
                     pict.linesize[1] = vp->bmp->pitches[2];
                     pict.linesize[2] = vp->bmp->pitches[1];
 
-                    if (is->subtitle_st->codec->width)
-                        scalex = (float)vp->bmp->w / is->subtitle_st->codec->width;
-                    if (is->subtitle_st->codec->height)
-                        scaley = (float)vp->bmp->h / is->subtitle_st->codec->height;
                     for (i = 0; i < sp->sub.num_rects; i++)
                         blend_subrect(&pict, &sp->sub.rects[i],
-                                      vp->bmp->w, vp->bmp->h,
-                                      scalex, scaley);
+                                      vp->bmp->w, vp->bmp->h);
 
                     SDL_UnlockYUVOverlay (vp->bmp);
                 }