diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 18:00:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 18:00:42 +0200 |
| commit | b0fdc76600a17a39b18deb7a1754246a973f3a98 (patch) | |
| tree | 60bb91d079843904d38b5e7df8786a8cde37eeb0 /libavcodec/dvenc.c | |
| parent | c2b1225c16f14a23a89c3eedbae51e6bc5667bc8 (diff) | |
| parent | 650dee63c8b1e6693c6cf5983f4a5ed3f571379f (diff) | |
| download | ffmpeg-b0fdc76600a17a39b18deb7a1754246a973f3a98.tar.gz | |
Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 06acf18e76..4a1103860d 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -50,7 +50,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "DVCPRO HD encoding is not supported.\n"); return AVERROR_PATCHWELCOME; } - ret = ff_dv_init_dynamic_tables(s->sys); + ret = ff_dv_init_dynamic_tables(s, s->sys); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error initializing work tables.\n"); return ret; @@ -683,7 +683,7 @@ static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt, c->coded_frame->pict_type = AV_PICTURE_TYPE_I; s->buf = pkt->data; - c->execute(c, dv_encode_video_segment, s->sys->work_chunks, NULL, + c->execute(c, dv_encode_video_segment, s->work_chunks, NULL, dv_work_pool_size(s->sys), sizeof(DVwork_chunk)); emms_c(); |