[FFmpeg-cvslog] r10021 - trunk/ffplay.c

[Michael Niedermayer]

Hi

On Thu, Aug 09, 2007 at 06:56:46PM +0200, Reimar D?ffinger wrote:
> Hello,
> On Thu, Aug 09, 2007 at 06:51:23PM +0200, Reimar D?ffinger wrote:
> > On Thu, Aug 09, 2007 at 06:46:00PM +0200, reimar wrote:
> > > Author: reimar
> > > Date: Thu Aug  9 18:45:59 2007
> > > New Revision: 10021
> > > 
> > > Log:
> > > Scale subtitle position
> > 
> > Hmm... Sorry. That I applied this was actually a messup.
> > I still find it useful, but if you want me to revert it please tell me.
> 
> Just to explain (I just checked what happened):
> I actually wanted to apply this:
> > @@ -407,7 +407,7 @@ void fill_border(VideoState *s, int x, int y, int w, int h, int color)
> >  
> >  #define YUVA_IN(y, u, v, a, s, pal)\
> >  {\
> > -    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)s];\
> > +    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\
> >      a = (val >> 24) & 0xff;\
> >      y = (val >> 16) & 0xff;\
> >      u = (val >> 8) & 0xff;\
> 
> But due to one of my buggy scripts I ended up committing the wrong git
> branch.

well i guess we are lucky that the branch you commited didnt had more stuff
in it ...


> I'll wait with applying the above so svn cp can easily be used to
> revert if requested.

iam in favor of reverting
if you really want this in svn i would suggest to
AVSubtitleRect rect= sp->sub.rects[i];
rect.x *= ...;
rect.y *= ...;
blend_subrect(... &rect);

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The greatest way to live with honor in this world is to be what we pretend
to be. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20070809/fed73a12/attachment.pgp>