diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 12:19:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 12:23:27 +0100 |
| commit | d2f9b9da03626bf94dac27d471114b867bacb1ed (patch) | |
| tree | 07e9c701ea655416b1a0678980b96d97a8f7de13 /libavcodec/svq1dec.c | |
| parent | 0c7733904e54472fa5bea04b4a7c35ff6fea9890 (diff) | |
| parent | 5a82ad644f281701eb22e0359fd732fac67aafa4 (diff) | |
| download | ffmpeg-d2f9b9da03626bf94dac27d471114b867bacb1ed.tar.gz | |
Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'
* commit '5a82ad644f281701eb22e0359fd732fac67aafa4':
svq1dec: Unbreak the scratch buffer allocation
Conflicts:
libavcodec/svq1dec.c
See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1dec.c')
| -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); |