[FFmpeg-cvslog] r25437 - trunk/libavcodec/ffv1.c

[michael]

Author: michael
Date: Sun Oct 10 23:04:38 2010
New Revision: 25437

Log:
Make sure version is not decreased for 16bit per sample colorspaces in ffv1.

Modified:
   trunk/libavcodec/ffv1.c

Modified: trunk/libavcodec/ffv1.c
==============================================================================
--- trunk/libavcodec/ffv1.c	Sun Oct 10 23:04:34 2010	(r25436)
+++ trunk/libavcodec/ffv1.c	Sun Oct 10 23:04:38 2010	(r25437)
@@ -713,7 +713,7 @@ static av_cold int encode_init(AVCodecCo
             av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample of more than 8 needs -coder 1 currently\n");
             return -1;
         }
-        s->version= 1;
+        s->version= FFMAX(s->version, 1);
     case PIX_FMT_YUV444P:
     case PIX_FMT_YUV422P:
     case PIX_FMT_YUV420P: