virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers

Browse Source 
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Steve Jiekak 2014-12-04 14:48:15 +01:00 committed by Michael Niedermayer
parent 6e9ac02af8
commit a32c3c2392
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dvenc.c
View File

@ -47,7 +47,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
PixblockDSPContext pdsp; PixblockDSPContext pdsp;
int ret; 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) { 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",

4
libavformat/dv.c
View File

@ -422,8 +422,8 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
int64_t timestamp, int flags) int64_t timestamp, int flags)
{ {
// FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk) // 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, const AVDVProfile *sys = av_dv_codec_profile2(c->vst->codec->width, c->vst->codec->height,
c->vst->codec->pix_fmt); c->vst->codec->pix_fmt, c->vst->codec->time_base);
int64_t offset; int64_t offset;
int64_t size = avio_size(s->pb) - s->data_offset; int64_t size = avio_size(s->pb) - s->data_offset;
int64_t max_offset = ((size - 1) / sys->frame_size) * sys->frame_size; int64_t max_offset = ((size - 1) / sys->frame_size) * sys->frame_size;

3
libavformat/dvenc.c
View File

@ -337,7 +337,8 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
goto bail_out; 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) if (!c->sys)
goto bail_out; goto bail_out;