[SCM] libav/experimental: -strict -1 comment fix

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:43:10 UTC 2013


The following commit has been merged in the experimental branch:
commit 53513831da58cae7603dc01270c1cf8e4252eba0
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Feb 24 16:39:03 2005 +0000

    -strict -1 comment fix
    
    Originally committed as revision 3976 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index cd1fa73..6a4c6ed 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -552,7 +552,7 @@ static int encode_init(AVCodecContext *avctx)
 
     if(avctx->strict_std_compliance >= 0){
         av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it wont be decodeable with future versions!!!\n"
-               "use vstrict=-1 to use it anyway\n");
+               "use vstrict=-1 / -strict -1 to use it anyway\n");
         return -1;
     }
         
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index b030436..42e8971 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -542,7 +542,7 @@ static int encode_init(AVCodecContext *avctx)
         if(s->interlaced != ( s->height > 288 ))
             av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n");
     }else if(avctx->strict_std_compliance>=0){
-        av_log(avctx, AV_LOG_ERROR, "This codec is under development; files encoded with it may not be decodeable with future versions!!! Set vstrict=-1 to use it anyway.\n");
+        av_log(avctx, AV_LOG_ERROR, "This codec is under development; files encoded with it may not be decodeable with future versions!!! Set vstrict=-1 / -strict -1 to use it anyway.\n");
         return -1;
     }
     
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 3566b72..fe4e4c0 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -2628,7 +2628,7 @@ static int encode_init(AVCodecContext *avctx)
 
     if(avctx->strict_std_compliance >= 0){
         av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it wont be decodeable with future versions!!!\n"
-               "use vstrict=-1 to use it anyway\n");
+               "use vstrict=-1 / -strict -1 to use it anyway\n");
         return -1;
     }
  

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list