diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-10-10 21:04:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-10-10 21:04:38 +0000 |
| commit | 228adaab8d6bfb6e0b041db427e1eff6bd48f335 (patch) | |
| tree | 3ce683d0e5c19624dce70786f33a5a74b7c435cf /libavcodec | |
| parent | 4f22b3bbbf886ab504a217ac470d543f710e89b7 (diff) | |
| download | ffmpeg-228adaab8d6bfb6e0b041db427e1eff6bd48f335.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index b3f4ebcd19..a440eb4709 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: |