[FFmpeg-cvslog] r9475 - in trunk: libavcodec/roqvideo.c libavcodec/roqvideoenc.c libavutil/internal.h vhook/watermark.c

[Måns Rullgård]

mru <subversion at mplayerhq.hu> writes:

> Author: mru
> Date: Thu Jul  5 08:47:02 2007
> New Revision: 9475
>
> Log:
> Merge branch 'master' of /var/git/ffmpeg/
>
> Modified:
>    trunk/libavcodec/roqvideo.c
>    trunk/libavcodec/roqvideoenc.c
>    trunk/libavutil/internal.h
>    trunk/vhook/watermark.c
>
> Modified: trunk/libavcodec/roqvideo.c
> ==============================================================================
>
> Modified: trunk/libavcodec/roqvideoenc.c
> ==============================================================================
>
> Modified: trunk/libavutil/internal.h
> ==============================================================================
>
> Modified: trunk/vhook/watermark.c
> ==============================================================================

I should have kept a closer eye on git-svn.  Sorry about this useless
commit.

-- 
M?ns Rullg?rd
mans at mansr.com