Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'
* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300': dv: Update DV-profile-related functions to current public API Conflicts: libavcodec/dvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b7f8d3de2c
@ -45,7 +45,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
|
|||||||
PixblockDSPContext pdsp;
|
PixblockDSPContext pdsp;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
s->sys = avpriv_dv_codec_profile(avctx);
|
s->sys = av_dv_codec_profile(avctx->width, avctx->height, avctx->pix_fmt);
|
||||||
if (!s->sys) {
|
if (!s->sys) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. "
|
av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. "
|
||||||
"Valid DV profiles are:\n",
|
"Valid DV profiles are:\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user