diff options
| author | Steve Jiekak <devaureshy@gmail.com> | 2014-12-04 14:48:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-04 20:24:00 +0100 |
| commit | a32c3c2392eca1eab3d833c4a655c2fef74f5f06 (patch) | |
| tree | d7ab99d8d49b6638f536a941ce6f4cc22c54f4e7 | |
| parent | 6e9ac02af8b67522fef6eaf22d983b6d1a39221e (diff) | |
| download | ffmpeg-streaming-a32c3c2392eca1eab3d833c4a655c2fef74f5f06.zip ffmpeg-streaming-a32c3c2392eca1eab3d833c4a655c2fef74f5f06.tar.gz | |
replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dvenc.c | 2 | ||||
| -rw-r--r-- | libavformat/dv.c | 4 | ||||
| -rw-r--r-- | libavformat/dvenc.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 5d810e3..7061508 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -47,7 +47,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) PixblockDSPContext pdsp; int ret; - s->sys = av_dv_codec_profile(avctx->width, avctx->height, avctx->pix_fmt); + s->sys = av_dv_codec_profile2(avctx->width, avctx->height, avctx->pix_fmt, avctx->time_base); if (!s->sys) { av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video. " "Valid DV profiles are:\n", diff --git a/libavformat/dv.c b/libavformat/dv.c index 095966c..4b8593d 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -422,8 +422,8 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c, int64_t timestamp, int flags) { // FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk) - const AVDVProfile *sys = av_dv_codec_profile(c->vst->codec->width, c->vst->codec->height, - c->vst->codec->pix_fmt); + const AVDVProfile *sys = av_dv_codec_profile2(c->vst->codec->width, c->vst->codec->height, + c->vst->codec->pix_fmt, c->vst->codec->time_base); int64_t offset; int64_t size = avio_size(s->pb) - s->data_offset; int64_t max_offset = ((size - 1) / sys->frame_size) * sys->frame_size; diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 18fdf9f..e99ac3c 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -337,7 +337,8 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) goto bail_out; } } - c->sys = av_dv_codec_profile(vst->codec->width, vst->codec->height, vst->codec->pix_fmt); + c->sys = av_dv_codec_profile2(vst->codec->width, vst->codec->height, + vst->codec->pix_fmt, vst->codec->time_base); if (!c->sys) goto bail_out; |
