Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 16:29:38 +0000 (18:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 16:29:38 +0000 (18:29 +0200)
* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300':
  dv: Update DV-profile-related functions to current public API

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvenc.c

index c639bea..ad98a9c 100644 (file)
@@ -45,7 +45,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
     PixblockDSPContext pdsp;
     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) {
         av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. "
                "Valid DV profiles are:\n",