aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-03-22 21:12:31 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-03-22 21:12:31 +0000
commitef768b0c326cc9a6208b5021e648edb33188e503 (patch)
treec6bae97298db9e6df4191574cbb49ee8237352ad
parentc51131290cae3d5f58427db7d7fbf97567722f98 (diff)
downloadffmpeg-ef768b0c326cc9a6208b5021e648edb33188e503.tar.gz
Disallow VLC coding with more than 8 bits as there are several bugs
in that code that could lead to broken files. AC coding is unaffected. Originally committed as revision 22638 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/ffv1.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 2efe7e192e..e3b71f7bb1 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -673,6 +673,10 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample invalid\n");
return -1;
}
+ if(!s->ac){
+ av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample of more than 8 needs -coder 1 currently\n");
+ return -1;
+ }
s->version= 1;
case PIX_FMT_YUV444P:
case PIX_FMT_YUV422P: