From 5dd7f994c6414f7040f9386ec077f0d7cfe88717 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 5 Oct 2010 17:24:18 +0000 Subject: [PATCH] Do not assume PIX_FMT_YUV420P will remain the only supported output format for H264. Originally committed as revision 25352 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 247dbb29b8..6c2cdf8174 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1917,7 +1917,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ if (prev) { av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, (const uint8_t**)prev->data, prev->linesize, - PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16); + s->avctx->pix_fmt, s->mb_width*16, s->mb_height*16); h->short_ref[0]->poc = prev->poc+2; } h->short_ref[0]->frame_num = h->prev_frame_num;