RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9' 

* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
  dvenc: initialize the profile only once, at init

Conflicts:
	libavcodec/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-20 17:15:39 +02:00
parent afa7ab557a 778111592b
commit c2b1225c16
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/dvenc.c
View File

@ -35,7 +35,11 @@
static av_cold int dvvideo_encode_init(AVCodecContext *avctx) static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
{ {
if (!avpriv_dv_codec_profile(avctx)) { DVVideoContext *s = avctx->priv_data;
int ret;
s->sys = avpriv_dv_codec_profile(avctx);
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",
avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt)); avctx->width, avctx->height, av_get_pix_fmt_name(avctx->pix_fmt));
@ -46,6 +50,11 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "DVCPRO HD encoding is not supported.\n"); av_log(avctx, AV_LOG_ERROR, "DVCPRO HD encoding is not supported.\n");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
ret = ff_dv_init_dynamic_tables(s->sys);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error initializing work tables.\n");
return ret;
}
avctx->coded_frame = av_frame_alloc(); avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame) if (!avctx->coded_frame)
@ -665,9 +674,6 @@ static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt,
DVVideoContext *s = c->priv_data; DVVideoContext *s = c->priv_data;
int ret; int ret;
s->sys = avpriv_dv_codec_profile(c);
if (!s->sys || ff_dv_init_dynamic_tables(s->sys))
return -1;
if ((ret = ff_alloc_packet2(c, pkt, s->sys->frame_size)) < 0) if ((ret = ff_alloc_packet2(c, pkt, s->sys->frame_size)) < 0)
return ret; return ret;