highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h264: be more tolerant on what pixel format changes trigger reinits

Browse Source 
Fixes Ticket3260

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8e92ff25469f75f5c1fcbb9ba5721cea341ca34a)

Conflicts:
	libavcodec/h264.c
This commit is contained in:
Michael Niedermayer 2014-03-17 02:25:20 +01:00 committed by Carl Eugen Hoyos
parent f31682f2f2
commit e3ce3d373c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264.c
View File

@ -3094,6 +3094,18 @@ static int h264_slice_header_init(H264Context *h, int reinit)
return 0; return 0;
} }
static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a)
{
switch (a) {
case AV_PIX_FMT_YUVJ420P: return AV_PIX_FMT_YUV420P;
case AV_PIX_FMT_YUVJ422P: return AV_PIX_FMT_YUV422P;
case AV_PIX_FMT_YUVJ444P: return AV_PIX_FMT_YUV444P;
default:
return a;
}
}
/** /**
* Decode a slice header. * Decode a slice header.
* This will also call ff_MPV_common_init() and frame_start() as needed. * This will also call ff_MPV_common_init() and frame_start() as needed.
@ -3212,7 +3224,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
|| h->mb_width != h->sps.mb_width || h->mb_width != h->sps.mb_width
|| h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) || h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag)
)); ));
if (h0->avctx->pix_fmt != get_pixel_format(h0, 0)) if (non_j_pixfmt(h0->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h0, 0)))
must_reinit = 1; must_reinit = 1;
h->mb_width = h->sps.mb_width; h->mb_width = h->sps.mb_width;