summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorSteve Jiekak <devaureshy@gmail.com>2014-12-04 14:48:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-04 20:24:00 +0100
commita32c3c2392eca1eab3d833c4a655c2fef74f5f06 (patch)
treed7ab99d8d49b6638f536a941ce6f4cc22c54f4e7 /libavformat
parent6e9ac02af8b67522fef6eaf22d983b6d1a39221e (diff)
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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/dv.c4
-rw-r--r--libavformat/dvenc.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 095966c9ee..4b8593d882 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 18fdf9fc86..e99ac3ce7e 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;