diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 18:29:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 18:29:38 +0200 |
| commit | b7f8d3de2c41de98185c304b4e5b35018a96e451 (patch) | |
| tree | 5762cb5d8734de9ea18eb590a07704bc76f9b0bd /libavcodec/dvenc.c | |
| parent | 6cdf409884bd2eef95bb478dfb04c1149dade155 (diff) | |
| parent | 7835c24e19d9e1cb43fba5a02ce9d81d518f1300 (diff) | |
| download | ffmpeg-b7f8d3de2c41de98185c304b4e5b35018a96e451.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index c639bea2e8..ad98a9c6ee 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -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", |