diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:05:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:05:18 +0100 |
| commit | 12d6bbf7cbcce742a8a7a0fc55ceca308da49789 (patch) | |
| tree | 5e2ecc0c004319a6acc1a0e02da4fb0933547a9b | |
| parent | 0d801c0bfdecd721c48f6665f7d0d80930c46f71 (diff) | |
| parent | 1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4 (diff) | |
| download | ffmpeg-12d6bbf7cbcce742a8a7a0fc55ceca308da49789.tar.gz | |
Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4
* commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4':
svq1dec: Unbreak the scratch buffer allocation
Conflicts:
libavcodec/svq1dec.c
See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/svq1dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 052b61839e..2f9ea16630 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -636,8 +636,9 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - av_fast_padded_malloc(&s->pkt_swapped, &s->pkt_swapped_allocated, - buf_size); + av_fast_padded_malloc(&s->pkt_swapped, + &s->pkt_swapped_allocated, + buf_size); if (!s->pkt_swapped) return AVERROR(ENOMEM); |