[SCM] libav/experimental: Make sure version is not decreased for 16bit per sample colorspaces in ffv1.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 228adaab8d6bfb6e0b041db427e1eff6bd48f335
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Oct 10 21:04:38 2010 +0000

    Make sure version is not decreased for 16bit per sample colorspaces in ffv1.
    
    Originally committed as revision 25437 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index b3f4ebc..a440eb4 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -713,7 +713,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
             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:

-- 
Libav/FFmpeg packaging