MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffv1enc: reduce stack usage.

Browse Source 
A bit more complex than e.g. adding it to the context, but
using the context for something that will be used only during
initialization seemed a bit wasteful.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2014-09-02 20:31:39 +02:00
parent efaa4a8dbf
commit 6724254118
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ffv1enc.c
View File

@ -862,9 +862,11 @@ static av_cold int encode_init(AVCodecContext *avctx)
}
if (avctx->stats_in) {
char *p = avctx->stats_in;
uint8_t best_state[256][256];
uint8_t (*best_state)[256] = av_malloc_array(256, 256);
int gob_count = 0;
char *next;
if (!best_state)
return AVERROR(ENOMEM);
av_assert0(s->version >= 2);
@ -875,6 +877,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (next == p) {
av_log(avctx, AV_LOG_ERROR,
"2Pass file invalid at %d %d [%s]\n", j, i, p);
av_freep(&best_state);
return AVERROR_INVALIDDATA;
}
p = next;
@ -888,6 +891,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR,
"2Pass file invalid at %d %d %d %d [%s]\n",
i, j, k, m, p);
av_freep(&best_state);
return AVERROR_INVALIDDATA;
}
p = next;
@ -896,6 +900,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
gob_count = strtol(p, &next, 0);
if (next == p || gob_count <= 0) {
av_log(avctx, AV_LOG_ERROR, "2Pass file invalid\n");
av_freep(&best_state);
return AVERROR_INVALIDDATA;
}
p = next;
@ -933,6 +938,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
}
}
}
av_freep(&best_state);
}
if (s->version > 1) {