generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffv1enc: PIX_FMT_0RGB32 support

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-28 17:39:25 +01:00
parent f7b160e829
commit 492aab8589
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/ffv1.c
View File

@ -593,7 +593,7 @@ static void encode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int st
sample[2][0][x]= r; sample[2][0][x]= r;
sample[3][0][x]= a; sample[3][0][x]= a;
} }
for(p=0; p<4; p++){ for(p=0; p<3 + s->transparency; p++){
sample[p][0][-1]= sample[p][1][0 ]; sample[p][0][-1]= sample[p][1][0 ];
sample[p][1][ w]= sample[p][1][w-1]; sample[p][1][ w]= sample[p][1][w-1];
encode_line(s, w, sample[p], (p+1)/2, 9); encode_line(s, w, sample[p], (p+1)/2, 9);
@ -939,6 +939,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->colorspace= 1; s->colorspace= 1;
s->transparency= 1; s->transparency= 1;
break; break;
case PIX_FMT_0RGB32:
s->colorspace= 1;
break;
default: default:
av_log(avctx, AV_LOG_ERROR, "format not supported\n"); av_log(avctx, AV_LOG_ERROR, "format not supported\n");
return -1; return -1;
@ -1793,7 +1796,7 @@ AVCodec ff_ffv1_encoder = {
.encode = encode_frame, .encode = encode_frame,
.close = common_end, .close = common_end,
.capabilities = CODEC_CAP_SLICE_THREADS, .capabilities = CODEC_CAP_SLICE_THREADS,
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_NONE}, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_NONE},
.long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
}; };
#endif #endif