virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'

Browse Source 
* commit '5a82ad644f281701eb22e0359fd732fac67aafa4':
  svq1dec: Unbreak the scratch buffer allocation

Conflicts:
	libavcodec/svq1dec.c

See: 4213fc5b9e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-15 12:19:16 +01:00
parent 0c7733904e 5a82ad644f
commit d2f9b9da03
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/svq1dec.c
View File

@@ -636,8 +636,9 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
av_fast_padded_malloc(&s->pkt_swapped, &s->pkt_swapped_allocated, av_fast_padded_malloc(&s->pkt_swapped,
buf_size); &s->pkt_swapped_allocated,
buf_size);
if (!s->pkt_swapped) if (!s->pkt_swapped)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);