Commit 14aa9da3 authored by Michael Niedermayer's avatar Michael Niedermayer

color and 10l

Originally committed as revision 3116 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fa2ae822
...@@ -1653,7 +1653,7 @@ static int svq1_encode_frame(AVCodecContext *avctx, unsigned char *buf, ...@@ -1653,7 +1653,7 @@ static int svq1_encode_frame(AVCodecContext *avctx, unsigned char *buf,
svq1_encode_plane(s, s->picture.data[0], s->frame_width, s->frame_height, svq1_encode_plane(s, s->picture.data[0], s->frame_width, s->frame_height,
s->picture.linesize[0]); s->picture.linesize[0]);
// if (avctx->flags & CODEC_FLAG_GRAY) { // if (avctx->flags & CODEC_FLAG_GRAY) {
if (1) { if (avctx->pix_fmt != PIX_FMT_YUV410P) {
svq1_output_intra_constant_mean(s, s->c_block_width * 2, svq1_output_intra_constant_mean(s, s->c_block_width * 2,
s->c_block_height * 2, 128); s->c_block_height * 2, 128);
} else { } else {
...@@ -1667,6 +1667,8 @@ if (1) { ...@@ -1667,6 +1667,8 @@ if (1) {
while(put_bits_count(&s->pb) & 31) while(put_bits_count(&s->pb) & 31)
put_bits(&s->pb, 1, 0); put_bits(&s->pb, 1, 0);
flush_put_bits(&s->pb);
return (put_bits_count(&s->pb) / 8); return (put_bits_count(&s->pb) / 8);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment