diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-25 00:19:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-25 00:19:04 +0400 |
| commit | 55ab66b45582f4973a0ba13b2573c8d5f6990652 (patch) | |
| tree | 86c24f0f6c0d8dd654f9c3532b9a20391177943f /intern | |
| parent | f673fc92930836a4df2a3f3552e3a106ea966a02 (diff) | |
| parent | f1cea89d99f0c80bdccd2ba1359142b5ff14cdb9 (diff) | |
Cycles: svn merge -r41205:41225 ^/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index a23dd22f932..05299525d67 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -29,7 +29,7 @@ /* check our ffmpeg is new enough, avoids user complaints */ #if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64)) -# error "FFmpeg 0.7 or newer is needed, Upgrade you're FFmpeg or disable it" +# error "FFmpeg 0.7 or newer is needed, Upgrade your FFmpeg or disable it" #endif /* end sanity check */ |