diff options
| -rw-r--r-- | libhb/decavcodec.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 9afe318ed..957e2ae75 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -1669,10 +1669,6 @@ static int decodePacket( hb_work_object_t * w ) // first frame because of M$ VC1 braindamage). if ( !pv->video_codec_opened ) { - pv->context->workaround_bugs = FF_BUG_AUTODETECT; - pv->context->err_recognition = AV_EF_CRCCHECK; - pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK; - if (setup_extradata(pv)) { // we didn't find the headers needed to set up extradata. @@ -1681,6 +1677,14 @@ static int decodePacket( hb_work_object_t * w ) return HB_WORK_OK; } + hb_avcodec_free_context(&pv->context); + pv->context = avcodec_alloc_context3(pv->codec); + + pv->context->workaround_bugs = FF_BUG_AUTODETECT; + pv->context->err_recognition = AV_EF_CRCCHECK; + pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK; + + #ifdef USE_QSV if (pv->qsv.decode && pv->qsv.config.io_pattern == MFX_IOPATTERN_OUT_OPAQUE_MEMORY) @@ -1848,6 +1852,7 @@ static int decavcodecvWork( hb_work_object_t * w, hb_buffer_t ** buf_in, if (pv->parser) { + int codec_id = pv->context->codec_id; len = av_parser_parse2(pv->parser, pv->context, &pout, &pout_len, in->data + pos, in->size - pos, pts, dts, 0 ); @@ -1855,6 +1860,14 @@ static int decavcodecvWork( hb_work_object_t * w, hb_buffer_t ** buf_in, parser_dts = pv->parser->dts; pts = AV_NOPTS_VALUE; dts = AV_NOPTS_VALUE; + + if (codec_id != pv->context->codec_id) + { + // The parser has decided to change the decoder underneath + // us. Update our context to match. This can happen + // for MPEG-1/2 video, perhaps others + pv->codec = avcodec_find_decoder(pv->context->codec_id); + } } else { |