diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 00:22:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 00:22:51 +0200 |
| commit | 6218831844fa5a517eda857adee7960aa0a9c033 (patch) | |
| tree | ef558092b7894d7f51b14af46203f17ddea49bb6 /ffmpeg.c | |
| parent | ab6228316a595ecc1ee462a34a4f19e1ffeb9062 (diff) | |
| parent | b9419b58826effc3d9afabd1a2e50d66391fbdbf (diff) | |
| download | ffmpeg-6218831844fa5a517eda857adee7960aa0a9c033.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/ftp: favour EPSV over PASV command
lavf/audiointerleave: return more meaningful error codes
lavf/audiointerleave: check for allocation failure
lavf/audiointerleave: use av_fifo_alloc_array
lavf/dvenc: use av_fifo_alloc_array
lavc/flac_parser: use av_fifo_alloc_array
lavc/frame_thread_encoder: use av_fifo_alloc_array
lavfi/vf_fps: use av_fifo_alloc_array
lavfi/buffersink: use av_fifo_alloc_array
ffmpeg: use av_fifo_alloc_array
lavd/jack_audio: use av_fifo_alloc_array
lavu/fifo: add av_fifo_alloc_array function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3180,7 +3180,7 @@ static int init_input_threads(void) for (i = 0; i < nb_input_files; i++) { InputFile *f = input_files[i]; - if (!(f->fifo = av_fifo_alloc(8*sizeof(AVPacket)))) + if (!(f->fifo = av_fifo_alloc_array(8, sizeof(AVPacket)))) return AVERROR(ENOMEM); if (f->ctx->pb ? !f->ctx->pb->seekable : |